diff --git a/.editorconfig b/.editorconfig
index 60d4fd6cae..140cc085c5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,901 +1,901 @@
-[*]
-charset = utf-8
-end_of_line = crlf
-indent_size = 4
-indent_style = space
-insert_final_newline = true
-max_line_length = 160
-tab_width = 4
-ij_continuation_indent_size = 8
-ij_formatter_off_tag = @formatter:off
-ij_formatter_on_tag = @formatter:on
-ij_formatter_tags_enabled = false
-ij_smart_tabs = false
-ij_visual_guides = none
-ij_wrap_on_typing = false
-
-[*.java]
-ij_java_align_consecutive_assignments = false
-ij_java_align_consecutive_variable_declarations = false
-ij_java_align_group_field_declarations = false
-ij_java_align_multiline_annotation_parameters = false
-ij_java_align_multiline_array_initializer_expression = false
-ij_java_align_multiline_assignment = false
-ij_java_align_multiline_binary_operation = false
-ij_java_align_multiline_chained_methods = false
-ij_java_align_multiline_extends_list = false
-ij_java_align_multiline_for = true
-ij_java_align_multiline_method_parentheses = false
-ij_java_align_multiline_parameters = true
-ij_java_align_multiline_parameters_in_calls = false
-ij_java_align_multiline_parenthesized_expression = false
-ij_java_align_multiline_records = true
-ij_java_align_multiline_resources = true
-ij_java_align_multiline_ternary_operation = false
-ij_java_align_multiline_text_blocks = false
-ij_java_align_multiline_throws_list = false
-ij_java_align_subsequent_simple_methods = false
-ij_java_align_throws_keyword = false
-ij_java_annotation_parameter_wrap = off
-ij_java_array_initializer_new_line_after_left_brace = false
-ij_java_array_initializer_right_brace_on_new_line = false
-ij_java_array_initializer_wrap = off
-ij_java_assert_statement_colon_on_next_line = false
-ij_java_assert_statement_wrap = off
-ij_java_assignment_wrap = off
-ij_java_binary_operation_sign_on_next_line = false
-ij_java_binary_operation_wrap = off
-ij_java_blank_lines_after_anonymous_class_header = 0
-ij_java_blank_lines_after_class_header = 0
-ij_java_blank_lines_after_imports = 1
-ij_java_blank_lines_after_package = 1
-ij_java_blank_lines_around_class = 1
-ij_java_blank_lines_around_field = 0
-ij_java_blank_lines_around_field_in_interface = 0
-ij_java_blank_lines_around_initializer = 1
-ij_java_blank_lines_around_method = 1
-ij_java_blank_lines_around_method_in_interface = 1
-ij_java_blank_lines_before_class_end = 0
-ij_java_blank_lines_before_imports = 1
-ij_java_blank_lines_before_method_body = 0
-ij_java_blank_lines_before_package = 0
-ij_java_block_brace_style = end_of_line
-ij_java_block_comment_at_first_column = true
-ij_java_builder_methods = none
-ij_java_call_parameters_new_line_after_left_paren = false
-ij_java_call_parameters_right_paren_on_new_line = false
-ij_java_call_parameters_wrap = off
-ij_java_case_statement_on_separate_line = true
-ij_java_catch_on_new_line = false
-ij_java_class_annotation_wrap = split_into_lines
-ij_java_class_brace_style = end_of_line
-ij_java_class_count_to_use_import_on_demand = 99
-ij_java_class_names_in_javadoc = 1
-ij_java_do_not_indent_top_level_class_members = false
-ij_java_do_not_wrap_after_single_annotation = false
-ij_java_do_while_brace_force = never
-ij_java_doc_add_blank_line_after_description = true
-ij_java_doc_add_blank_line_after_param_comments = false
-ij_java_doc_add_blank_line_after_return = false
-ij_java_doc_add_p_tag_on_empty_lines = true
-ij_java_doc_align_exception_comments = true
-ij_java_doc_align_param_comments = true
-ij_java_doc_do_not_wrap_if_one_line = false
-ij_java_doc_enable_formatting = true
-ij_java_doc_enable_leading_asterisks = true
-ij_java_doc_indent_on_continuation = false
-ij_java_doc_keep_empty_lines = true
-ij_java_doc_keep_empty_parameter_tag = true
-ij_java_doc_keep_empty_return_tag = true
-ij_java_doc_keep_empty_throws_tag = true
-ij_java_doc_keep_invalid_tags = true
-ij_java_doc_param_description_on_new_line = false
-ij_java_doc_preserve_line_breaks = false
-ij_java_doc_use_throws_not_exception_tag = true
-ij_java_else_on_new_line = false
-ij_java_enum_constants_wrap = off
-ij_java_extends_keyword_wrap = off
-ij_java_extends_list_wrap = off
-ij_java_field_annotation_wrap = split_into_lines
-ij_java_finally_on_new_line = false
-ij_java_for_brace_force = never
-ij_java_for_statement_new_line_after_left_paren = false
-ij_java_for_statement_right_paren_on_new_line = false
-ij_java_for_statement_wrap = off
-ij_java_generate_final_locals = false
-ij_java_generate_final_parameters = false
-ij_java_if_brace_force = never
-ij_java_imports_layout = $android.**,$androidx.**,$com.**,$junit.**,$net.**,$org.**,$java.**,$javax.**,$*,|,android.**,|,androidx.**,|,com.**,|,junit.**,|,net.**,|,org.**,|,java.**,|,javax.**,|,*,|
-ij_java_indent_case_from_switch = true
-ij_java_insert_inner_class_imports = false
-ij_java_insert_override_annotation = true
-ij_java_keep_blank_lines_before_right_brace = 2
-ij_java_keep_blank_lines_between_package_declaration_and_header = 2
-ij_java_keep_blank_lines_in_code = 2
-ij_java_keep_blank_lines_in_declarations = 2
-ij_java_keep_builder_methods_indents = false
-ij_java_keep_control_statement_in_one_line = true
-ij_java_keep_first_column_comment = true
-ij_java_keep_indents_on_empty_lines = false
-ij_java_keep_line_breaks = true
-ij_java_keep_multiple_expressions_in_one_line = false
-ij_java_keep_simple_blocks_in_one_line = false
-ij_java_keep_simple_classes_in_one_line = false
-ij_java_keep_simple_lambdas_in_one_line = false
-ij_java_keep_simple_methods_in_one_line = false
-ij_java_label_indent_absolute = false
-ij_java_label_indent_size = 0
-ij_java_lambda_brace_style = end_of_line
-ij_java_layout_static_imports_separately = true
-ij_java_line_comment_add_space = false
-ij_java_line_comment_at_first_column = true
-ij_java_method_annotation_wrap = split_into_lines
-ij_java_method_brace_style = end_of_line
-ij_java_method_call_chain_wrap = off
-ij_java_method_parameters_new_line_after_left_paren = false
-ij_java_method_parameters_right_paren_on_new_line = false
-ij_java_method_parameters_wrap = off
-ij_java_modifier_list_wrap = false
-ij_java_names_count_to_use_import_on_demand = 99
-ij_java_new_line_after_lparen_in_record_header = false
-ij_java_parameter_annotation_wrap = off
-ij_java_parentheses_expression_new_line_after_left_paren = false
-ij_java_parentheses_expression_right_paren_on_new_line = false
-ij_java_place_assignment_sign_on_next_line = false
-ij_java_prefer_longer_names = true
-ij_java_prefer_parameters_wrap = false
-ij_java_record_components_wrap = normal
-ij_java_repeat_synchronized = true
-ij_java_replace_instanceof_and_cast = false
-ij_java_replace_null_check = true
-ij_java_replace_sum_lambda_with_method_ref = true
-ij_java_resource_list_new_line_after_left_paren = false
-ij_java_resource_list_right_paren_on_new_line = false
-ij_java_resource_list_wrap = off
-ij_java_rparen_on_new_line_in_record_header = false
-ij_java_space_after_closing_angle_bracket_in_type_argument = false
-ij_java_space_after_colon = true
-ij_java_space_after_comma = true
-ij_java_space_after_comma_in_type_arguments = true
-ij_java_space_after_for_semicolon = true
-ij_java_space_after_quest = true
-ij_java_space_after_type_cast = true
-ij_java_space_before_annotation_array_initializer_left_brace = false
-ij_java_space_before_annotation_parameter_list = false
-ij_java_space_before_array_initializer_left_brace = false
-ij_java_space_before_catch_keyword = true
-ij_java_space_before_catch_left_brace = true
-ij_java_space_before_catch_parentheses = true
-ij_java_space_before_class_left_brace = true
-ij_java_space_before_colon = true
-ij_java_space_before_colon_in_foreach = true
-ij_java_space_before_comma = false
-ij_java_space_before_do_left_brace = true
-ij_java_space_before_else_keyword = true
-ij_java_space_before_else_left_brace = true
-ij_java_space_before_finally_keyword = true
-ij_java_space_before_finally_left_brace = true
-ij_java_space_before_for_left_brace = true
-ij_java_space_before_for_parentheses = true
-ij_java_space_before_for_semicolon = false
-ij_java_space_before_if_left_brace = true
-ij_java_space_before_if_parentheses = true
-ij_java_space_before_method_call_parentheses = false
-ij_java_space_before_method_left_brace = true
-ij_java_space_before_method_parentheses = false
-ij_java_space_before_opening_angle_bracket_in_type_parameter = false
-ij_java_space_before_quest = true
-ij_java_space_before_switch_left_brace = true
-ij_java_space_before_switch_parentheses = true
-ij_java_space_before_synchronized_left_brace = true
-ij_java_space_before_synchronized_parentheses = true
-ij_java_space_before_try_left_brace = true
-ij_java_space_before_try_parentheses = true
-ij_java_space_before_type_parameter_list = false
-ij_java_space_before_while_keyword = true
-ij_java_space_before_while_left_brace = true
-ij_java_space_before_while_parentheses = true
-ij_java_space_inside_one_line_enum_braces = false
-ij_java_space_within_empty_array_initializer_braces = false
-ij_java_space_within_empty_method_call_parentheses = false
-ij_java_space_within_empty_method_parentheses = false
-ij_java_spaces_around_additive_operators = true
-ij_java_spaces_around_assignment_operators = true
-ij_java_spaces_around_bitwise_operators = true
-ij_java_spaces_around_equality_operators = true
-ij_java_spaces_around_lambda_arrow = true
-ij_java_spaces_around_logical_operators = true
-ij_java_spaces_around_method_ref_dbl_colon = false
-ij_java_spaces_around_multiplicative_operators = true
-ij_java_spaces_around_relational_operators = true
-ij_java_spaces_around_shift_operators = true
-ij_java_spaces_around_type_bounds_in_type_parameters = true
-ij_java_spaces_around_unary_operator = false
-ij_java_spaces_within_angle_brackets = false
-ij_java_spaces_within_annotation_parentheses = false
-ij_java_spaces_within_array_initializer_braces = false
-ij_java_spaces_within_braces = false
-ij_java_spaces_within_brackets = false
-ij_java_spaces_within_cast_parentheses = false
-ij_java_spaces_within_catch_parentheses = false
-ij_java_spaces_within_for_parentheses = false
-ij_java_spaces_within_if_parentheses = false
-ij_java_spaces_within_method_call_parentheses = false
-ij_java_spaces_within_method_parentheses = false
-ij_java_spaces_within_parentheses = false
-ij_java_spaces_within_record_header = false
-ij_java_spaces_within_switch_parentheses = false
-ij_java_spaces_within_synchronized_parentheses = false
-ij_java_spaces_within_try_parentheses = false
-ij_java_spaces_within_while_parentheses = false
-ij_java_special_else_if_treatment = true
-ij_java_subclass_name_suffix = Impl
-ij_java_ternary_operation_signs_on_next_line = false
-ij_java_ternary_operation_wrap = off
-ij_java_test_name_suffix = Test
-ij_java_throws_keyword_wrap = off
-ij_java_throws_list_wrap = off
-ij_java_use_external_annotations = false
-ij_java_use_fq_class_names = false
-ij_java_use_relative_indents = false
-ij_java_use_single_class_imports = true
-ij_java_variable_annotation_wrap = off
-ij_java_visibility = public
-ij_java_while_brace_force = never
-ij_java_while_on_new_line = false
-ij_java_wrap_comments = false
-ij_java_wrap_first_method_in_call_chain = false
-ij_java_wrap_long_lines = false
-
-[*.properties]
-ij_properties_align_group_field_declarations = false
-ij_properties_keep_blank_lines = false
-ij_properties_key_value_delimiter = equals
-ij_properties_spaces_around_key_value_delimiter = false
-
-[.editorconfig]
-ij_editorconfig_align_group_field_declarations = false
-ij_editorconfig_space_after_colon = false
-ij_editorconfig_space_after_comma = true
-ij_editorconfig_space_before_colon = false
-ij_editorconfig_space_before_comma = false
-ij_editorconfig_spaces_around_assignment_operators = true
-
-[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul}]
-ij_continuation_indent_size = 4
-ij_xml_align_attributes = false
-ij_xml_align_text = false
-ij_xml_attribute_wrap = normal
-ij_xml_block_comment_at_first_column = true
-ij_xml_keep_blank_lines = 2
-ij_xml_keep_indents_on_empty_lines = false
-ij_xml_keep_line_breaks = false
-ij_xml_keep_line_breaks_in_text = true
-ij_xml_keep_whitespaces = false
-ij_xml_keep_whitespaces_around_cdata = preserve
-ij_xml_keep_whitespaces_inside_cdata = false
-ij_xml_line_comment_at_first_column = true
-ij_xml_space_after_tag_name = false
-ij_xml_space_around_equals_in_attribute = false
-ij_xml_space_inside_empty_tag = true
-ij_xml_text_wrap = normal
-ij_xml_use_custom_settings = true
-
-[{*.bash,*.sh,*.zsh}]
-indent_size = 2
-tab_width = 2
-ij_shell_binary_ops_start_line = false
-ij_shell_keep_column_alignment_padding = false
-ij_shell_minify_program = false
-ij_shell_redirect_followed_by_space = false
-ij_shell_switch_cases_indented = false
-ij_shell_use_unix_line_separator = true
-
-[{*.c,*.c++,*.cc,*.cp,*.cpp,*.cu,*.cuh,*.cxx,*.h,*.h++,*.hh,*.hp,*.hpp,*.hxx,*.i,*.icc,*.ii,*.inl,*.ino,*.ipp,*.m,*.mm,*.pch,*.tcc,*.tpp}]
-ij_c_add_brief_tag = false
-ij_c_add_getter_prefix = true
-ij_c_add_setter_prefix = true
-ij_c_align_dictionary_pair_values = false
-ij_c_align_group_field_declarations = false
-ij_c_align_init_list_in_columns = true
-ij_c_align_multiline_array_initializer_expression = true
-ij_c_align_multiline_assignment = true
-ij_c_align_multiline_binary_operation = true
-ij_c_align_multiline_chained_methods = false
-ij_c_align_multiline_for = true
-ij_c_align_multiline_ternary_operation = true
-ij_c_array_initializer_comma_on_next_line = false
-ij_c_array_initializer_new_line_after_left_brace = false
-ij_c_array_initializer_right_brace_on_new_line = false
-ij_c_array_initializer_wrap = normal
-ij_c_assignment_wrap = off
-ij_c_binary_operation_sign_on_next_line = false
-ij_c_binary_operation_wrap = normal
-ij_c_blank_lines_after_class_header = 0
-ij_c_blank_lines_after_imports = 1
-ij_c_blank_lines_around_class = 1
-ij_c_blank_lines_around_field = 0
-ij_c_blank_lines_around_field_in_interface = 0
-ij_c_blank_lines_around_method = 1
-ij_c_blank_lines_around_method_in_interface = 1
-ij_c_blank_lines_around_namespace = 0
-ij_c_blank_lines_around_properties_in_declaration = 0
-ij_c_blank_lines_around_properties_in_interface = 0
-ij_c_blank_lines_before_imports = 1
-ij_c_blank_lines_before_method_body = 0
-ij_c_block_brace_placement = end_of_line
-ij_c_block_brace_style = end_of_line
-ij_c_block_comment_at_first_column = true
-ij_c_catch_on_new_line = false
-ij_c_class_brace_style = end_of_line
-ij_c_class_constructor_init_list_align_multiline = true
-ij_c_class_constructor_init_list_comma_on_next_line = false
-ij_c_class_constructor_init_list_new_line_after_colon = never
-ij_c_class_constructor_init_list_new_line_before_colon = if_long
-ij_c_class_constructor_init_list_wrap = normal
-ij_c_copy_is_deep = false
-ij_c_create_interface_for_categories = true
-ij_c_declare_generated_methods = true
-ij_c_description_include_member_names = true
-ij_c_discharged_short_ternary_operator = false
-ij_c_do_not_add_breaks = false
-ij_c_do_while_brace_force = never
-ij_c_else_on_new_line = false
-ij_c_enum_constants_comma_on_next_line = false
-ij_c_enum_constants_wrap = on_every_item
-ij_c_for_brace_force = never
-ij_c_for_statement_new_line_after_left_paren = false
-ij_c_for_statement_right_paren_on_new_line = false
-ij_c_for_statement_wrap = off
-ij_c_function_brace_placement = end_of_line
-ij_c_function_call_arguments_align_multiline = true
-ij_c_function_call_arguments_align_multiline_pars = false
-ij_c_function_call_arguments_comma_on_next_line = false
-ij_c_function_call_arguments_new_line_after_lpar = false
-ij_c_function_call_arguments_new_line_before_rpar = false
-ij_c_function_call_arguments_wrap = normal
-ij_c_function_non_top_after_return_type_wrap = normal
-ij_c_function_parameters_align_multiline = true
-ij_c_function_parameters_align_multiline_pars = false
-ij_c_function_parameters_comma_on_next_line = false
-ij_c_function_parameters_new_line_after_lpar = false
-ij_c_function_parameters_new_line_before_rpar = false
-ij_c_function_parameters_wrap = normal
-ij_c_function_top_after_return_type_wrap = normal
-ij_c_generate_additional_eq_operators = true
-ij_c_generate_additional_rel_operators = true
-ij_c_generate_class_constructor = true
-ij_c_generate_comparison_operators_use_std_tie = false
-ij_c_generate_instance_variables_for_properties = ask
-ij_c_generate_operators_as_members = true
-ij_c_header_guard_style_pattern = ${PROJECT_NAME}_${FILE_NAME}_${EXT}
-ij_c_if_brace_force = never
-ij_c_in_line_short_ternary_operator = true
-ij_c_indent_block_comment = true
-ij_c_indent_c_struct_members = 4
-ij_c_indent_case_from_switch = true
-ij_c_indent_class_members = 4
-ij_c_indent_directive_as_code = false
-ij_c_indent_implementation_members = 0
-ij_c_indent_inside_code_block = 4
-ij_c_indent_interface_members = 0
-ij_c_indent_interface_members_except_ivars_block = false
-ij_c_indent_namespace_members = 4
-ij_c_indent_preprocessor_directive = 0
-ij_c_indent_visibility_keywords = 0
-ij_c_insert_override = true
-ij_c_insert_virtual_with_override = false
-ij_c_introduce_auto_vars = false
-ij_c_introduce_const_params = false
-ij_c_introduce_const_vars = false
-ij_c_introduce_generate_property = false
-ij_c_introduce_generate_synthesize = true
-ij_c_introduce_globals_to_header = true
-ij_c_introduce_prop_to_private_category = false
-ij_c_introduce_static_consts = true
-ij_c_introduce_use_ns_types = false
-ij_c_ivars_prefix = _
-ij_c_keep_blank_lines_before_end = 2
-ij_c_keep_blank_lines_before_right_brace = 2
-ij_c_keep_blank_lines_in_code = 2
-ij_c_keep_blank_lines_in_declarations = 2
-ij_c_keep_case_expressions_in_one_line = false
-ij_c_keep_control_statement_in_one_line = true
-ij_c_keep_directive_at_first_column = true
-ij_c_keep_first_column_comment = true
-ij_c_keep_line_breaks = true
-ij_c_keep_nested_namespaces_in_one_line = false
-ij_c_keep_simple_blocks_in_one_line = true
-ij_c_keep_simple_methods_in_one_line = true
-ij_c_keep_structures_in_one_line = false
-ij_c_lambda_capture_list_align_multiline = false
-ij_c_lambda_capture_list_align_multiline_bracket = false
-ij_c_lambda_capture_list_comma_on_next_line = false
-ij_c_lambda_capture_list_new_line_after_lbracket = false
-ij_c_lambda_capture_list_new_line_before_rbracket = false
-ij_c_lambda_capture_list_wrap = off
-ij_c_line_comment_add_space = false
-ij_c_line_comment_at_first_column = true
-ij_c_method_brace_placement = end_of_line
-ij_c_method_call_arguments_align_by_colons = true
-ij_c_method_call_arguments_align_multiline = false
-ij_c_method_call_arguments_special_dictionary_pairs_treatment = true
-ij_c_method_call_arguments_wrap = off
-ij_c_method_call_chain_wrap = off
-ij_c_method_parameters_align_by_colons = true
-ij_c_method_parameters_align_multiline = false
-ij_c_method_parameters_wrap = off
-ij_c_namespace_brace_placement = end_of_line
-ij_c_parentheses_expression_new_line_after_left_paren = false
-ij_c_parentheses_expression_right_paren_on_new_line = false
-ij_c_place_assignment_sign_on_next_line = false
-ij_c_property_nonatomic = true
-ij_c_put_ivars_to_implementation = true
-ij_c_refactor_compatibility_aliases_and_classes = true
-ij_c_refactor_properties_and_ivars = true
-ij_c_release_style = ivar
-ij_c_retain_object_parameters_in_constructor = true
-ij_c_semicolon_after_method_signature = false
-ij_c_shift_operation_align_multiline = true
-ij_c_shift_operation_wrap = normal
-ij_c_show_non_virtual_functions = false
-ij_c_space_after_colon = true
-ij_c_space_after_colon_in_selector = false
-ij_c_space_after_comma = true
-ij_c_space_after_cup_in_blocks = false
-ij_c_space_after_dictionary_literal_colon = true
-ij_c_space_after_for_semicolon = true
-ij_c_space_after_init_list_colon = true
-ij_c_space_after_method_parameter_type_parentheses = false
-ij_c_space_after_method_return_type_parentheses = false
-ij_c_space_after_pointer_in_declaration = false
-ij_c_space_after_quest = true
-ij_c_space_after_reference_in_declaration = false
-ij_c_space_after_reference_in_rvalue = false
-ij_c_space_after_structures_rbrace = true
-ij_c_space_after_superclass_colon = true
-ij_c_space_after_type_cast = true
-ij_c_space_after_visibility_sign_in_method_declaration = true
-ij_c_space_before_autorelease_pool_lbrace = true
-ij_c_space_before_catch_keyword = true
-ij_c_space_before_catch_left_brace = true
-ij_c_space_before_catch_parentheses = true
-ij_c_space_before_category_parentheses = true
-ij_c_space_before_chained_send_message = true
-ij_c_space_before_class_left_brace = true
-ij_c_space_before_colon = true
-ij_c_space_before_comma = false
-ij_c_space_before_dictionary_literal_colon = false
-ij_c_space_before_do_left_brace = true
-ij_c_space_before_else_keyword = true
-ij_c_space_before_else_left_brace = true
-ij_c_space_before_for_left_brace = true
-ij_c_space_before_for_parentheses = true
-ij_c_space_before_for_semicolon = false
-ij_c_space_before_if_left_brace = true
-ij_c_space_before_if_parentheses = true
-ij_c_space_before_init_list = false
-ij_c_space_before_init_list_colon = true
-ij_c_space_before_method_call_parentheses = false
-ij_c_space_before_method_left_brace = true
-ij_c_space_before_method_parentheses = false
-ij_c_space_before_namespace_lbrace = true
-ij_c_space_before_pointer_in_declaration = true
-ij_c_space_before_property_attributes_parentheses = false
-ij_c_space_before_protocols_brackets = true
-ij_c_space_before_quest = true
-ij_c_space_before_reference_in_declaration = true
-ij_c_space_before_superclass_colon = true
-ij_c_space_before_switch_left_brace = true
-ij_c_space_before_switch_parentheses = true
-ij_c_space_before_template_call_lt = false
-ij_c_space_before_template_declaration_lt = false
-ij_c_space_before_try_left_brace = true
-ij_c_space_before_while_keyword = true
-ij_c_space_before_while_left_brace = true
-ij_c_space_before_while_parentheses = true
-ij_c_space_between_adjacent_brackets = false
-ij_c_space_between_operator_and_punctuator = false
-ij_c_space_within_empty_array_initializer_braces = false
-ij_c_spaces_around_additive_operators = true
-ij_c_spaces_around_assignment_operators = true
-ij_c_spaces_around_bitwise_operators = true
-ij_c_spaces_around_equality_operators = true
-ij_c_spaces_around_lambda_arrow = true
-ij_c_spaces_around_logical_operators = true
-ij_c_spaces_around_multiplicative_operators = true
-ij_c_spaces_around_pm_operators = false
-ij_c_spaces_around_relational_operators = true
-ij_c_spaces_around_shift_operators = true
-ij_c_spaces_around_unary_operator = false
-ij_c_spaces_within_array_initializer_braces = false
-ij_c_spaces_within_braces = true
-ij_c_spaces_within_brackets = false
-ij_c_spaces_within_cast_parentheses = false
-ij_c_spaces_within_catch_parentheses = false
-ij_c_spaces_within_category_parentheses = false
-ij_c_spaces_within_empty_braces = false
-ij_c_spaces_within_empty_function_call_parentheses = false
-ij_c_spaces_within_empty_function_declaration_parentheses = false
-ij_c_spaces_within_empty_lambda_capture_list_bracket = false
-ij_c_spaces_within_empty_template_call_ltgt = false
-ij_c_spaces_within_empty_template_declaration_ltgt = false
-ij_c_spaces_within_for_parentheses = false
-ij_c_spaces_within_function_call_parentheses = false
-ij_c_spaces_within_function_declaration_parentheses = false
-ij_c_spaces_within_if_parentheses = false
-ij_c_spaces_within_lambda_capture_list_bracket = false
-ij_c_spaces_within_method_parameter_type_parentheses = false
-ij_c_spaces_within_method_return_type_parentheses = false
-ij_c_spaces_within_parentheses = false
-ij_c_spaces_within_property_attributes_parentheses = false
-ij_c_spaces_within_protocols_brackets = false
-ij_c_spaces_within_send_message_brackets = false
-ij_c_spaces_within_switch_parentheses = false
-ij_c_spaces_within_template_call_ltgt = false
-ij_c_spaces_within_template_declaration_ltgt = false
-ij_c_spaces_within_template_double_gt = true
-ij_c_spaces_within_while_parentheses = false
-ij_c_special_else_if_treatment = true
-ij_c_superclass_list_after_colon = never
-ij_c_superclass_list_align_multiline = true
-ij_c_superclass_list_before_colon = if_long
-ij_c_superclass_list_comma_on_next_line = false
-ij_c_superclass_list_wrap = on_every_item
-ij_c_tag_prefix_of_block_comment = at
-ij_c_tag_prefix_of_line_comment = back_slash
-ij_c_template_call_arguments_align_multiline = false
-ij_c_template_call_arguments_align_multiline_pars = false
-ij_c_template_call_arguments_comma_on_next_line = false
-ij_c_template_call_arguments_new_line_after_lt = false
-ij_c_template_call_arguments_new_line_before_gt = false
-ij_c_template_call_arguments_wrap = off
-ij_c_template_declaration_function_body_indent = false
-ij_c_template_declaration_function_wrap = split_into_lines
-ij_c_template_declaration_struct_body_indent = false
-ij_c_template_declaration_struct_wrap = split_into_lines
-ij_c_template_parameters_align_multiline = false
-ij_c_template_parameters_align_multiline_pars = false
-ij_c_template_parameters_comma_on_next_line = false
-ij_c_template_parameters_new_line_after_lt = false
-ij_c_template_parameters_new_line_before_gt = false
-ij_c_template_parameters_wrap = off
-ij_c_ternary_operation_signs_on_next_line = true
-ij_c_ternary_operation_wrap = normal
-ij_c_type_qualifiers_placement = before
-ij_c_use_modern_casts = true
-ij_c_use_setters_in_constructor = true
-ij_c_while_brace_force = never
-ij_c_while_on_new_line = false
-ij_c_wrap_property_declaration = off
-
-[{*.cmake,CMakeLists.txt}]
-ij_cmake_align_multiline_parameters_in_calls = false
-ij_cmake_force_commands_case = 2
-ij_cmake_keep_blank_lines_in_code = 2
-ij_cmake_space_before_for_parentheses = true
-ij_cmake_space_before_if_parentheses = true
-ij_cmake_space_before_method_call_parentheses = false
-ij_cmake_space_before_method_parentheses = false
-ij_cmake_space_before_while_parentheses = true
-ij_cmake_spaces_within_for_parentheses = false
-ij_cmake_spaces_within_if_parentheses = false
-ij_cmake_spaces_within_method_call_parentheses = false
-ij_cmake_spaces_within_method_parentheses = false
-ij_cmake_spaces_within_while_parentheses = false
-
-[{*.gant,*.gradle,*.groovy,*.gy}]
-ij_groovy_align_group_field_declarations = false
-ij_groovy_align_multiline_array_initializer_expression = false
-ij_groovy_align_multiline_assignment = false
-ij_groovy_align_multiline_binary_operation = false
-ij_groovy_align_multiline_chained_methods = false
-ij_groovy_align_multiline_extends_list = false
-ij_groovy_align_multiline_for = true
-ij_groovy_align_multiline_list_or_map = true
-ij_groovy_align_multiline_method_parentheses = false
-ij_groovy_align_multiline_parameters = true
-ij_groovy_align_multiline_parameters_in_calls = false
-ij_groovy_align_multiline_resources = true
-ij_groovy_align_multiline_ternary_operation = false
-ij_groovy_align_multiline_throws_list = false
-ij_groovy_align_named_args_in_map = true
-ij_groovy_align_throws_keyword = false
-ij_groovy_array_initializer_new_line_after_left_brace = false
-ij_groovy_array_initializer_right_brace_on_new_line = false
-ij_groovy_array_initializer_wrap = off
-ij_groovy_assert_statement_wrap = off
-ij_groovy_assignment_wrap = off
-ij_groovy_binary_operation_wrap = off
-ij_groovy_blank_lines_after_class_header = 0
-ij_groovy_blank_lines_after_imports = 1
-ij_groovy_blank_lines_after_package = 1
-ij_groovy_blank_lines_around_class = 1
-ij_groovy_blank_lines_around_field = 0
-ij_groovy_blank_lines_around_field_in_interface = 0
-ij_groovy_blank_lines_around_method = 1
-ij_groovy_blank_lines_around_method_in_interface = 1
-ij_groovy_blank_lines_before_imports = 1
-ij_groovy_blank_lines_before_method_body = 0
-ij_groovy_blank_lines_before_package = 0
-ij_groovy_block_brace_style = end_of_line
-ij_groovy_block_comment_at_first_column = true
-ij_groovy_call_parameters_new_line_after_left_paren = false
-ij_groovy_call_parameters_right_paren_on_new_line = false
-ij_groovy_call_parameters_wrap = off
-ij_groovy_catch_on_new_line = false
-ij_groovy_class_annotation_wrap = split_into_lines
-ij_groovy_class_brace_style = end_of_line
-ij_groovy_class_count_to_use_import_on_demand = 5
-ij_groovy_do_while_brace_force = never
-ij_groovy_else_on_new_line = false
-ij_groovy_enum_constants_wrap = off
-ij_groovy_extends_keyword_wrap = off
-ij_groovy_extends_list_wrap = off
-ij_groovy_field_annotation_wrap = split_into_lines
-ij_groovy_finally_on_new_line = false
-ij_groovy_for_brace_force = never
-ij_groovy_for_statement_new_line_after_left_paren = false
-ij_groovy_for_statement_right_paren_on_new_line = false
-ij_groovy_for_statement_wrap = off
-ij_groovy_if_brace_force = never
-ij_groovy_import_annotation_wrap = 2
-ij_groovy_imports_layout = *,|,javax.**,java.**,|,$*
-ij_groovy_indent_case_from_switch = true
-ij_groovy_indent_label_blocks = true
-ij_groovy_insert_inner_class_imports = false
-ij_groovy_keep_blank_lines_before_right_brace = 2
-ij_groovy_keep_blank_lines_in_code = 2
-ij_groovy_keep_blank_lines_in_declarations = 2
-ij_groovy_keep_control_statement_in_one_line = true
-ij_groovy_keep_first_column_comment = true
-ij_groovy_keep_indents_on_empty_lines = false
-ij_groovy_keep_line_breaks = true
-ij_groovy_keep_multiple_expressions_in_one_line = false
-ij_groovy_keep_simple_blocks_in_one_line = false
-ij_groovy_keep_simple_classes_in_one_line = true
-ij_groovy_keep_simple_lambdas_in_one_line = true
-ij_groovy_keep_simple_methods_in_one_line = true
-ij_groovy_label_indent_absolute = false
-ij_groovy_label_indent_size = 0
-ij_groovy_lambda_brace_style = end_of_line
-ij_groovy_layout_static_imports_separately = true
-ij_groovy_line_comment_add_space = false
-ij_groovy_line_comment_at_first_column = true
-ij_groovy_method_annotation_wrap = split_into_lines
-ij_groovy_method_brace_style = end_of_line
-ij_groovy_method_call_chain_wrap = off
-ij_groovy_method_parameters_new_line_after_left_paren = false
-ij_groovy_method_parameters_right_paren_on_new_line = false
-ij_groovy_method_parameters_wrap = off
-ij_groovy_modifier_list_wrap = false
-ij_groovy_names_count_to_use_import_on_demand = 3
-ij_groovy_parameter_annotation_wrap = off
-ij_groovy_parentheses_expression_new_line_after_left_paren = false
-ij_groovy_parentheses_expression_right_paren_on_new_line = false
-ij_groovy_prefer_parameters_wrap = false
-ij_groovy_resource_list_new_line_after_left_paren = false
-ij_groovy_resource_list_right_paren_on_new_line = false
-ij_groovy_resource_list_wrap = off
-ij_groovy_space_after_assert_separator = true
-ij_groovy_space_after_colon = true
-ij_groovy_space_after_comma = true
-ij_groovy_space_after_comma_in_type_arguments = true
-ij_groovy_space_after_for_semicolon = true
-ij_groovy_space_after_quest = true
-ij_groovy_space_after_type_cast = true
-ij_groovy_space_before_annotation_parameter_list = false
-ij_groovy_space_before_array_initializer_left_brace = false
-ij_groovy_space_before_assert_separator = false
-ij_groovy_space_before_catch_keyword = true
-ij_groovy_space_before_catch_left_brace = true
-ij_groovy_space_before_catch_parentheses = true
-ij_groovy_space_before_class_left_brace = true
-ij_groovy_space_before_closure_left_brace = true
-ij_groovy_space_before_colon = true
-ij_groovy_space_before_comma = false
-ij_groovy_space_before_do_left_brace = true
-ij_groovy_space_before_else_keyword = true
-ij_groovy_space_before_else_left_brace = true
-ij_groovy_space_before_finally_keyword = true
-ij_groovy_space_before_finally_left_brace = true
-ij_groovy_space_before_for_left_brace = true
-ij_groovy_space_before_for_parentheses = true
-ij_groovy_space_before_for_semicolon = false
-ij_groovy_space_before_if_left_brace = true
-ij_groovy_space_before_if_parentheses = true
-ij_groovy_space_before_method_call_parentheses = false
-ij_groovy_space_before_method_left_brace = true
-ij_groovy_space_before_method_parentheses = false
-ij_groovy_space_before_quest = true
-ij_groovy_space_before_switch_left_brace = true
-ij_groovy_space_before_switch_parentheses = true
-ij_groovy_space_before_synchronized_left_brace = true
-ij_groovy_space_before_synchronized_parentheses = true
-ij_groovy_space_before_try_left_brace = true
-ij_groovy_space_before_try_parentheses = true
-ij_groovy_space_before_while_keyword = true
-ij_groovy_space_before_while_left_brace = true
-ij_groovy_space_before_while_parentheses = true
-ij_groovy_space_in_named_argument = true
-ij_groovy_space_in_named_argument_before_colon = false
-ij_groovy_space_within_empty_array_initializer_braces = false
-ij_groovy_space_within_empty_method_call_parentheses = false
-ij_groovy_spaces_around_additive_operators = true
-ij_groovy_spaces_around_assignment_operators = true
-ij_groovy_spaces_around_bitwise_operators = true
-ij_groovy_spaces_around_equality_operators = true
-ij_groovy_spaces_around_lambda_arrow = true
-ij_groovy_spaces_around_logical_operators = true
-ij_groovy_spaces_around_multiplicative_operators = true
-ij_groovy_spaces_around_regex_operators = true
-ij_groovy_spaces_around_relational_operators = true
-ij_groovy_spaces_around_shift_operators = true
-ij_groovy_spaces_within_annotation_parentheses = false
-ij_groovy_spaces_within_array_initializer_braces = false
-ij_groovy_spaces_within_braces = true
-ij_groovy_spaces_within_brackets = false
-ij_groovy_spaces_within_cast_parentheses = false
-ij_groovy_spaces_within_catch_parentheses = false
-ij_groovy_spaces_within_for_parentheses = false
-ij_groovy_spaces_within_gstring_injection_braces = false
-ij_groovy_spaces_within_if_parentheses = false
-ij_groovy_spaces_within_list_or_map = false
-ij_groovy_spaces_within_method_call_parentheses = false
-ij_groovy_spaces_within_method_parentheses = false
-ij_groovy_spaces_within_parentheses = false
-ij_groovy_spaces_within_switch_parentheses = false
-ij_groovy_spaces_within_synchronized_parentheses = false
-ij_groovy_spaces_within_try_parentheses = false
-ij_groovy_spaces_within_tuple_expression = false
-ij_groovy_spaces_within_while_parentheses = false
-ij_groovy_special_else_if_treatment = true
-ij_groovy_ternary_operation_wrap = off
-ij_groovy_throws_keyword_wrap = off
-ij_groovy_throws_list_wrap = off
-ij_groovy_use_flying_geese_braces = false
-ij_groovy_use_fq_class_names = false
-ij_groovy_use_fq_class_names_in_javadoc = true
-ij_groovy_use_relative_indents = false
-ij_groovy_use_single_class_imports = true
-ij_groovy_variable_annotation_wrap = off
-ij_groovy_while_brace_force = never
-ij_groovy_while_on_new_line = false
-ij_groovy_wrap_long_lines = false
-
-[{*.gradle.kts,*.kt,*.kts,*.main.kts}]
-ij_kotlin_align_in_columns_case_branch = true
-ij_kotlin_align_multiline_binary_operation = false
-ij_kotlin_align_multiline_extends_list = false
-ij_kotlin_align_multiline_method_parentheses = false
-ij_kotlin_align_multiline_parameters = true
-ij_kotlin_align_multiline_parameters_in_calls = false
-ij_kotlin_allow_trailing_comma = false
-ij_kotlin_allow_trailing_comma_on_call_site = false
-ij_kotlin_assignment_wrap = off
-ij_kotlin_blank_lines_after_class_header = 0
-ij_kotlin_blank_lines_around_block_when_branches = 0
-ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1
-ij_kotlin_block_comment_at_first_column = true
-ij_kotlin_call_parameters_new_line_after_left_paren = false
-ij_kotlin_call_parameters_right_paren_on_new_line = false
-ij_kotlin_call_parameters_wrap = off
-ij_kotlin_catch_on_new_line = false
-ij_kotlin_class_annotation_wrap = off
-ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
-ij_kotlin_continuation_indent_for_chained_calls = true
-ij_kotlin_continuation_indent_for_expression_bodies = true
-ij_kotlin_continuation_indent_in_argument_lists = true
-ij_kotlin_continuation_indent_in_elvis = true
-ij_kotlin_continuation_indent_in_if_conditions = true
-ij_kotlin_continuation_indent_in_parameter_lists = true
-ij_kotlin_continuation_indent_in_supertype_lists = true
-ij_kotlin_else_on_new_line = false
-ij_kotlin_enum_constants_wrap = off
-ij_kotlin_extends_list_wrap = off
-ij_kotlin_field_annotation_wrap = normal
-ij_kotlin_finally_on_new_line = false
-ij_kotlin_if_rparen_on_new_line = false
-ij_kotlin_import_nested_classes = false
-ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
-ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
-ij_kotlin_keep_blank_lines_before_right_brace = 0
-ij_kotlin_keep_blank_lines_in_code = 1
-ij_kotlin_keep_blank_lines_in_declarations = 1
-ij_kotlin_keep_first_column_comment = true
-ij_kotlin_keep_indents_on_empty_lines = false
-ij_kotlin_keep_line_breaks = true
-ij_kotlin_lbrace_on_next_line = false
-ij_kotlin_line_comment_add_space = false
-ij_kotlin_line_comment_at_first_column = true
-ij_kotlin_method_annotation_wrap = split_into_lines
-ij_kotlin_method_call_chain_wrap = off
-ij_kotlin_method_parameters_new_line_after_left_paren = false
-ij_kotlin_method_parameters_right_paren_on_new_line = false
-ij_kotlin_method_parameters_wrap = off
-ij_kotlin_name_count_to_use_star_import = 2147483647
-ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
-ij_kotlin_packages_to_use_import_on_demand = kotlinx.android.synthetic.**
-ij_kotlin_parameter_annotation_wrap = off
-ij_kotlin_space_after_comma = true
-ij_kotlin_space_after_extend_colon = true
-ij_kotlin_space_after_type_colon = true
-ij_kotlin_space_before_catch_parentheses = true
-ij_kotlin_space_before_comma = false
-ij_kotlin_space_before_extend_colon = true
-ij_kotlin_space_before_for_parentheses = true
-ij_kotlin_space_before_if_parentheses = true
-ij_kotlin_space_before_lambda_arrow = true
-ij_kotlin_space_before_type_colon = false
-ij_kotlin_space_before_when_parentheses = true
-ij_kotlin_space_before_while_parentheses = true
-ij_kotlin_spaces_around_additive_operators = true
-ij_kotlin_spaces_around_assignment_operators = true
-ij_kotlin_spaces_around_equality_operators = true
-ij_kotlin_spaces_around_function_type_arrow = true
-ij_kotlin_spaces_around_logical_operators = true
-ij_kotlin_spaces_around_multiplicative_operators = true
-ij_kotlin_spaces_around_range = false
-ij_kotlin_spaces_around_relational_operators = true
-ij_kotlin_spaces_around_unary_operator = false
-ij_kotlin_spaces_around_when_arrow = true
-ij_kotlin_use_custom_formatting_for_modifiers = true
-ij_kotlin_variable_annotation_wrap = off
-ij_kotlin_while_on_new_line = false
-ij_kotlin_wrap_elvis_expressions = 1
-ij_kotlin_wrap_expression_body_functions = 0
-ij_kotlin_wrap_first_method_in_call_chain = false
-
-[{*.har,*.json}]
-indent_size = 2
-ij_json_keep_blank_lines_in_code = 0
-ij_json_keep_indents_on_empty_lines = false
-ij_json_keep_line_breaks = true
-ij_json_space_after_colon = true
-ij_json_space_after_comma = true
-ij_json_space_before_colon = true
-ij_json_space_before_comma = false
-ij_json_spaces_within_braces = false
-ij_json_spaces_within_brackets = false
-ij_json_wrap_long_lines = false
-
-[{*.htm,*.html,*.sht,*.shtm,*.shtml}]
-ij_html_add_new_line_before_tags = body,div,p,form,h1,h2,h3
-ij_html_align_attributes = true
-ij_html_align_text = false
-ij_html_attribute_wrap = normal
-ij_html_block_comment_at_first_column = true
-ij_html_do_not_align_children_of_min_lines = 0
-ij_html_do_not_break_if_inline_tags = title,h1,h2,h3,h4,h5,h6,p
-ij_html_do_not_indent_children_of_tags = html,body,thead,tbody,tfoot
-ij_html_enforce_quotes = false
-ij_html_inline_tags = a,abbr,acronym,b,basefont,bdo,big,br,cite,cite,code,dfn,em,font,i,img,input,kbd,label,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var
-ij_html_keep_blank_lines = 2
-ij_html_keep_indents_on_empty_lines = false
-ij_html_keep_line_breaks = true
-ij_html_keep_line_breaks_in_text = true
-ij_html_keep_whitespaces = false
-ij_html_keep_whitespaces_inside = span,pre,textarea
-ij_html_line_comment_at_first_column = true
-ij_html_new_line_after_last_attribute = never
-ij_html_new_line_before_first_attribute = never
-ij_html_quote_style = double
-ij_html_remove_new_line_before_tags = br
-ij_html_space_after_tag_name = false
-ij_html_space_around_equality_in_attribute = false
-ij_html_space_inside_empty_tag = false
-ij_html_text_wrap = normal
-ij_html_uniform_ident = false
-
-[{*.yaml,*.yml}]
-indent_size = 2
-ij_yaml_align_values_properties = do_not_align
-ij_yaml_autoinsert_sequence_marker = true
-ij_yaml_block_mapping_on_new_line = false
-ij_yaml_indent_sequence_value = true
-ij_yaml_keep_indents_on_empty_lines = false
-ij_yaml_keep_line_breaks = true
-ij_yaml_sequence_on_new_line = false
-ij_yaml_space_before_colon = false
-ij_yaml_spaces_within_braces = true
-ij_yaml_spaces_within_brackets = true
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+max_line_length = 160
+tab_width = 4
+ij_continuation_indent_size = 8
+ij_formatter_off_tag = @formatter:off
+ij_formatter_on_tag = @formatter:on
+ij_formatter_tags_enabled = false
+ij_smart_tabs = false
+ij_visual_guides = none
+ij_wrap_on_typing = false
+
+[*.java]
+ij_java_align_consecutive_assignments = false
+ij_java_align_consecutive_variable_declarations = false
+ij_java_align_group_field_declarations = false
+ij_java_align_multiline_annotation_parameters = false
+ij_java_align_multiline_array_initializer_expression = false
+ij_java_align_multiline_assignment = false
+ij_java_align_multiline_binary_operation = false
+ij_java_align_multiline_chained_methods = false
+ij_java_align_multiline_extends_list = false
+ij_java_align_multiline_for = true
+ij_java_align_multiline_method_parentheses = false
+ij_java_align_multiline_parameters = true
+ij_java_align_multiline_parameters_in_calls = false
+ij_java_align_multiline_parenthesized_expression = false
+ij_java_align_multiline_records = true
+ij_java_align_multiline_resources = true
+ij_java_align_multiline_ternary_operation = false
+ij_java_align_multiline_text_blocks = false
+ij_java_align_multiline_throws_list = false
+ij_java_align_subsequent_simple_methods = false
+ij_java_align_throws_keyword = false
+ij_java_annotation_parameter_wrap = off
+ij_java_array_initializer_new_line_after_left_brace = false
+ij_java_array_initializer_right_brace_on_new_line = false
+ij_java_array_initializer_wrap = off
+ij_java_assert_statement_colon_on_next_line = false
+ij_java_assert_statement_wrap = off
+ij_java_assignment_wrap = off
+ij_java_binary_operation_sign_on_next_line = false
+ij_java_binary_operation_wrap = off
+ij_java_blank_lines_after_anonymous_class_header = 0
+ij_java_blank_lines_after_class_header = 0
+ij_java_blank_lines_after_imports = 1
+ij_java_blank_lines_after_package = 1
+ij_java_blank_lines_around_class = 1
+ij_java_blank_lines_around_field = 0
+ij_java_blank_lines_around_field_in_interface = 0
+ij_java_blank_lines_around_initializer = 1
+ij_java_blank_lines_around_method = 1
+ij_java_blank_lines_around_method_in_interface = 1
+ij_java_blank_lines_before_class_end = 0
+ij_java_blank_lines_before_imports = 1
+ij_java_blank_lines_before_method_body = 0
+ij_java_blank_lines_before_package = 0
+ij_java_block_brace_style = end_of_line
+ij_java_block_comment_at_first_column = true
+ij_java_builder_methods = none
+ij_java_call_parameters_new_line_after_left_paren = false
+ij_java_call_parameters_right_paren_on_new_line = false
+ij_java_call_parameters_wrap = off
+ij_java_case_statement_on_separate_line = true
+ij_java_catch_on_new_line = false
+ij_java_class_annotation_wrap = split_into_lines
+ij_java_class_brace_style = end_of_line
+ij_java_class_count_to_use_import_on_demand = 99
+ij_java_class_names_in_javadoc = 1
+ij_java_do_not_indent_top_level_class_members = false
+ij_java_do_not_wrap_after_single_annotation = false
+ij_java_do_while_brace_force = never
+ij_java_doc_add_blank_line_after_description = true
+ij_java_doc_add_blank_line_after_param_comments = false
+ij_java_doc_add_blank_line_after_return = false
+ij_java_doc_add_p_tag_on_empty_lines = true
+ij_java_doc_align_exception_comments = true
+ij_java_doc_align_param_comments = true
+ij_java_doc_do_not_wrap_if_one_line = false
+ij_java_doc_enable_formatting = true
+ij_java_doc_enable_leading_asterisks = true
+ij_java_doc_indent_on_continuation = false
+ij_java_doc_keep_empty_lines = true
+ij_java_doc_keep_empty_parameter_tag = true
+ij_java_doc_keep_empty_return_tag = true
+ij_java_doc_keep_empty_throws_tag = true
+ij_java_doc_keep_invalid_tags = true
+ij_java_doc_param_description_on_new_line = false
+ij_java_doc_preserve_line_breaks = false
+ij_java_doc_use_throws_not_exception_tag = true
+ij_java_else_on_new_line = false
+ij_java_enum_constants_wrap = off
+ij_java_extends_keyword_wrap = off
+ij_java_extends_list_wrap = off
+ij_java_field_annotation_wrap = split_into_lines
+ij_java_finally_on_new_line = false
+ij_java_for_brace_force = never
+ij_java_for_statement_new_line_after_left_paren = false
+ij_java_for_statement_right_paren_on_new_line = false
+ij_java_for_statement_wrap = off
+ij_java_generate_final_locals = false
+ij_java_generate_final_parameters = false
+ij_java_if_brace_force = never
+ij_java_imports_layout = $android.**,$androidx.**,$com.**,$junit.**,$net.**,$org.**,$java.**,$javax.**,$*,|,android.**,|,androidx.**,|,com.**,|,junit.**,|,net.**,|,org.**,|,java.**,|,javax.**,|,*,|
+ij_java_indent_case_from_switch = true
+ij_java_insert_inner_class_imports = false
+ij_java_insert_override_annotation = true
+ij_java_keep_blank_lines_before_right_brace = 2
+ij_java_keep_blank_lines_between_package_declaration_and_header = 2
+ij_java_keep_blank_lines_in_code = 2
+ij_java_keep_blank_lines_in_declarations = 2
+ij_java_keep_builder_methods_indents = false
+ij_java_keep_control_statement_in_one_line = true
+ij_java_keep_first_column_comment = true
+ij_java_keep_indents_on_empty_lines = false
+ij_java_keep_line_breaks = true
+ij_java_keep_multiple_expressions_in_one_line = false
+ij_java_keep_simple_blocks_in_one_line = false
+ij_java_keep_simple_classes_in_one_line = false
+ij_java_keep_simple_lambdas_in_one_line = false
+ij_java_keep_simple_methods_in_one_line = false
+ij_java_label_indent_absolute = false
+ij_java_label_indent_size = 0
+ij_java_lambda_brace_style = end_of_line
+ij_java_layout_static_imports_separately = true
+ij_java_line_comment_add_space = false
+ij_java_line_comment_at_first_column = true
+ij_java_method_annotation_wrap = split_into_lines
+ij_java_method_brace_style = end_of_line
+ij_java_method_call_chain_wrap = off
+ij_java_method_parameters_new_line_after_left_paren = false
+ij_java_method_parameters_right_paren_on_new_line = false
+ij_java_method_parameters_wrap = off
+ij_java_modifier_list_wrap = false
+ij_java_names_count_to_use_import_on_demand = 99
+ij_java_new_line_after_lparen_in_record_header = false
+ij_java_parameter_annotation_wrap = off
+ij_java_parentheses_expression_new_line_after_left_paren = false
+ij_java_parentheses_expression_right_paren_on_new_line = false
+ij_java_place_assignment_sign_on_next_line = false
+ij_java_prefer_longer_names = true
+ij_java_prefer_parameters_wrap = false
+ij_java_record_components_wrap = normal
+ij_java_repeat_synchronized = true
+ij_java_replace_instanceof_and_cast = false
+ij_java_replace_null_check = true
+ij_java_replace_sum_lambda_with_method_ref = true
+ij_java_resource_list_new_line_after_left_paren = false
+ij_java_resource_list_right_paren_on_new_line = false
+ij_java_resource_list_wrap = off
+ij_java_rparen_on_new_line_in_record_header = false
+ij_java_space_after_closing_angle_bracket_in_type_argument = false
+ij_java_space_after_colon = true
+ij_java_space_after_comma = true
+ij_java_space_after_comma_in_type_arguments = true
+ij_java_space_after_for_semicolon = true
+ij_java_space_after_quest = true
+ij_java_space_after_type_cast = true
+ij_java_space_before_annotation_array_initializer_left_brace = false
+ij_java_space_before_annotation_parameter_list = false
+ij_java_space_before_array_initializer_left_brace = false
+ij_java_space_before_catch_keyword = true
+ij_java_space_before_catch_left_brace = true
+ij_java_space_before_catch_parentheses = true
+ij_java_space_before_class_left_brace = true
+ij_java_space_before_colon = true
+ij_java_space_before_colon_in_foreach = true
+ij_java_space_before_comma = false
+ij_java_space_before_do_left_brace = true
+ij_java_space_before_else_keyword = true
+ij_java_space_before_else_left_brace = true
+ij_java_space_before_finally_keyword = true
+ij_java_space_before_finally_left_brace = true
+ij_java_space_before_for_left_brace = true
+ij_java_space_before_for_parentheses = true
+ij_java_space_before_for_semicolon = false
+ij_java_space_before_if_left_brace = true
+ij_java_space_before_if_parentheses = true
+ij_java_space_before_method_call_parentheses = false
+ij_java_space_before_method_left_brace = true
+ij_java_space_before_method_parentheses = false
+ij_java_space_before_opening_angle_bracket_in_type_parameter = false
+ij_java_space_before_quest = true
+ij_java_space_before_switch_left_brace = true
+ij_java_space_before_switch_parentheses = true
+ij_java_space_before_synchronized_left_brace = true
+ij_java_space_before_synchronized_parentheses = true
+ij_java_space_before_try_left_brace = true
+ij_java_space_before_try_parentheses = true
+ij_java_space_before_type_parameter_list = false
+ij_java_space_before_while_keyword = true
+ij_java_space_before_while_left_brace = true
+ij_java_space_before_while_parentheses = true
+ij_java_space_inside_one_line_enum_braces = false
+ij_java_space_within_empty_array_initializer_braces = false
+ij_java_space_within_empty_method_call_parentheses = false
+ij_java_space_within_empty_method_parentheses = false
+ij_java_spaces_around_additive_operators = true
+ij_java_spaces_around_assignment_operators = true
+ij_java_spaces_around_bitwise_operators = true
+ij_java_spaces_around_equality_operators = true
+ij_java_spaces_around_lambda_arrow = true
+ij_java_spaces_around_logical_operators = true
+ij_java_spaces_around_method_ref_dbl_colon = false
+ij_java_spaces_around_multiplicative_operators = true
+ij_java_spaces_around_relational_operators = true
+ij_java_spaces_around_shift_operators = true
+ij_java_spaces_around_type_bounds_in_type_parameters = true
+ij_java_spaces_around_unary_operator = false
+ij_java_spaces_within_angle_brackets = false
+ij_java_spaces_within_annotation_parentheses = false
+ij_java_spaces_within_array_initializer_braces = false
+ij_java_spaces_within_braces = false
+ij_java_spaces_within_brackets = false
+ij_java_spaces_within_cast_parentheses = false
+ij_java_spaces_within_catch_parentheses = false
+ij_java_spaces_within_for_parentheses = false
+ij_java_spaces_within_if_parentheses = false
+ij_java_spaces_within_method_call_parentheses = false
+ij_java_spaces_within_method_parentheses = false
+ij_java_spaces_within_parentheses = false
+ij_java_spaces_within_record_header = false
+ij_java_spaces_within_switch_parentheses = false
+ij_java_spaces_within_synchronized_parentheses = false
+ij_java_spaces_within_try_parentheses = false
+ij_java_spaces_within_while_parentheses = false
+ij_java_special_else_if_treatment = true
+ij_java_subclass_name_suffix = Impl
+ij_java_ternary_operation_signs_on_next_line = false
+ij_java_ternary_operation_wrap = off
+ij_java_test_name_suffix = Test
+ij_java_throws_keyword_wrap = off
+ij_java_throws_list_wrap = off
+ij_java_use_external_annotations = false
+ij_java_use_fq_class_names = false
+ij_java_use_relative_indents = false
+ij_java_use_single_class_imports = true
+ij_java_variable_annotation_wrap = off
+ij_java_visibility = public
+ij_java_while_brace_force = never
+ij_java_while_on_new_line = false
+ij_java_wrap_comments = false
+ij_java_wrap_first_method_in_call_chain = false
+ij_java_wrap_long_lines = false
+
+[*.properties]
+ij_properties_align_group_field_declarations = false
+ij_properties_keep_blank_lines = false
+ij_properties_key_value_delimiter = equals
+ij_properties_spaces_around_key_value_delimiter = false
+
+[.editorconfig]
+ij_editorconfig_align_group_field_declarations = false
+ij_editorconfig_space_after_colon = false
+ij_editorconfig_space_after_comma = true
+ij_editorconfig_space_before_colon = false
+ij_editorconfig_space_before_comma = false
+ij_editorconfig_spaces_around_assignment_operators = true
+
+[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul}]
+ij_continuation_indent_size = 4
+ij_xml_align_attributes = false
+ij_xml_align_text = false
+ij_xml_attribute_wrap = normal
+ij_xml_block_comment_at_first_column = true
+ij_xml_keep_blank_lines = 2
+ij_xml_keep_indents_on_empty_lines = false
+ij_xml_keep_line_breaks = false
+ij_xml_keep_line_breaks_in_text = true
+ij_xml_keep_whitespaces = false
+ij_xml_keep_whitespaces_around_cdata = preserve
+ij_xml_keep_whitespaces_inside_cdata = false
+ij_xml_line_comment_at_first_column = true
+ij_xml_space_after_tag_name = false
+ij_xml_space_around_equals_in_attribute = false
+ij_xml_space_inside_empty_tag = true
+ij_xml_text_wrap = normal
+ij_xml_use_custom_settings = true
+
+[{*.bash,*.sh,*.zsh}]
+indent_size = 2
+tab_width = 2
+ij_shell_binary_ops_start_line = false
+ij_shell_keep_column_alignment_padding = false
+ij_shell_minify_program = false
+ij_shell_redirect_followed_by_space = false
+ij_shell_switch_cases_indented = false
+ij_shell_use_unix_line_separator = true
+
+[{*.c,*.c++,*.cc,*.cp,*.cpp,*.cu,*.cuh,*.cxx,*.h,*.h++,*.hh,*.hp,*.hpp,*.hxx,*.i,*.icc,*.ii,*.inl,*.ino,*.ipp,*.m,*.mm,*.pch,*.tcc,*.tpp}]
+ij_c_add_brief_tag = false
+ij_c_add_getter_prefix = true
+ij_c_add_setter_prefix = true
+ij_c_align_dictionary_pair_values = false
+ij_c_align_group_field_declarations = false
+ij_c_align_init_list_in_columns = true
+ij_c_align_multiline_array_initializer_expression = true
+ij_c_align_multiline_assignment = true
+ij_c_align_multiline_binary_operation = true
+ij_c_align_multiline_chained_methods = false
+ij_c_align_multiline_for = true
+ij_c_align_multiline_ternary_operation = true
+ij_c_array_initializer_comma_on_next_line = false
+ij_c_array_initializer_new_line_after_left_brace = false
+ij_c_array_initializer_right_brace_on_new_line = false
+ij_c_array_initializer_wrap = normal
+ij_c_assignment_wrap = off
+ij_c_binary_operation_sign_on_next_line = false
+ij_c_binary_operation_wrap = normal
+ij_c_blank_lines_after_class_header = 0
+ij_c_blank_lines_after_imports = 1
+ij_c_blank_lines_around_class = 1
+ij_c_blank_lines_around_field = 0
+ij_c_blank_lines_around_field_in_interface = 0
+ij_c_blank_lines_around_method = 1
+ij_c_blank_lines_around_method_in_interface = 1
+ij_c_blank_lines_around_namespace = 0
+ij_c_blank_lines_around_properties_in_declaration = 0
+ij_c_blank_lines_around_properties_in_interface = 0
+ij_c_blank_lines_before_imports = 1
+ij_c_blank_lines_before_method_body = 0
+ij_c_block_brace_placement = end_of_line
+ij_c_block_brace_style = end_of_line
+ij_c_block_comment_at_first_column = true
+ij_c_catch_on_new_line = false
+ij_c_class_brace_style = end_of_line
+ij_c_class_constructor_init_list_align_multiline = true
+ij_c_class_constructor_init_list_comma_on_next_line = false
+ij_c_class_constructor_init_list_new_line_after_colon = never
+ij_c_class_constructor_init_list_new_line_before_colon = if_long
+ij_c_class_constructor_init_list_wrap = normal
+ij_c_copy_is_deep = false
+ij_c_create_interface_for_categories = true
+ij_c_declare_generated_methods = true
+ij_c_description_include_member_names = true
+ij_c_discharged_short_ternary_operator = false
+ij_c_do_not_add_breaks = false
+ij_c_do_while_brace_force = never
+ij_c_else_on_new_line = false
+ij_c_enum_constants_comma_on_next_line = false
+ij_c_enum_constants_wrap = on_every_item
+ij_c_for_brace_force = never
+ij_c_for_statement_new_line_after_left_paren = false
+ij_c_for_statement_right_paren_on_new_line = false
+ij_c_for_statement_wrap = off
+ij_c_function_brace_placement = end_of_line
+ij_c_function_call_arguments_align_multiline = true
+ij_c_function_call_arguments_align_multiline_pars = false
+ij_c_function_call_arguments_comma_on_next_line = false
+ij_c_function_call_arguments_new_line_after_lpar = false
+ij_c_function_call_arguments_new_line_before_rpar = false
+ij_c_function_call_arguments_wrap = normal
+ij_c_function_non_top_after_return_type_wrap = normal
+ij_c_function_parameters_align_multiline = true
+ij_c_function_parameters_align_multiline_pars = false
+ij_c_function_parameters_comma_on_next_line = false
+ij_c_function_parameters_new_line_after_lpar = false
+ij_c_function_parameters_new_line_before_rpar = false
+ij_c_function_parameters_wrap = normal
+ij_c_function_top_after_return_type_wrap = normal
+ij_c_generate_additional_eq_operators = true
+ij_c_generate_additional_rel_operators = true
+ij_c_generate_class_constructor = true
+ij_c_generate_comparison_operators_use_std_tie = false
+ij_c_generate_instance_variables_for_properties = ask
+ij_c_generate_operators_as_members = true
+ij_c_header_guard_style_pattern = ${PROJECT_NAME}_${FILE_NAME}_${EXT}
+ij_c_if_brace_force = never
+ij_c_in_line_short_ternary_operator = true
+ij_c_indent_block_comment = true
+ij_c_indent_c_struct_members = 4
+ij_c_indent_case_from_switch = true
+ij_c_indent_class_members = 4
+ij_c_indent_directive_as_code = false
+ij_c_indent_implementation_members = 0
+ij_c_indent_inside_code_block = 4
+ij_c_indent_interface_members = 0
+ij_c_indent_interface_members_except_ivars_block = false
+ij_c_indent_namespace_members = 4
+ij_c_indent_preprocessor_directive = 0
+ij_c_indent_visibility_keywords = 0
+ij_c_insert_override = true
+ij_c_insert_virtual_with_override = false
+ij_c_introduce_auto_vars = false
+ij_c_introduce_const_params = false
+ij_c_introduce_const_vars = false
+ij_c_introduce_generate_property = false
+ij_c_introduce_generate_synthesize = true
+ij_c_introduce_globals_to_header = true
+ij_c_introduce_prop_to_private_category = false
+ij_c_introduce_static_consts = true
+ij_c_introduce_use_ns_types = false
+ij_c_ivars_prefix = _
+ij_c_keep_blank_lines_before_end = 2
+ij_c_keep_blank_lines_before_right_brace = 2
+ij_c_keep_blank_lines_in_code = 2
+ij_c_keep_blank_lines_in_declarations = 2
+ij_c_keep_case_expressions_in_one_line = false
+ij_c_keep_control_statement_in_one_line = true
+ij_c_keep_directive_at_first_column = true
+ij_c_keep_first_column_comment = true
+ij_c_keep_line_breaks = true
+ij_c_keep_nested_namespaces_in_one_line = false
+ij_c_keep_simple_blocks_in_one_line = true
+ij_c_keep_simple_methods_in_one_line = true
+ij_c_keep_structures_in_one_line = false
+ij_c_lambda_capture_list_align_multiline = false
+ij_c_lambda_capture_list_align_multiline_bracket = false
+ij_c_lambda_capture_list_comma_on_next_line = false
+ij_c_lambda_capture_list_new_line_after_lbracket = false
+ij_c_lambda_capture_list_new_line_before_rbracket = false
+ij_c_lambda_capture_list_wrap = off
+ij_c_line_comment_add_space = false
+ij_c_line_comment_at_first_column = true
+ij_c_method_brace_placement = end_of_line
+ij_c_method_call_arguments_align_by_colons = true
+ij_c_method_call_arguments_align_multiline = false
+ij_c_method_call_arguments_special_dictionary_pairs_treatment = true
+ij_c_method_call_arguments_wrap = off
+ij_c_method_call_chain_wrap = off
+ij_c_method_parameters_align_by_colons = true
+ij_c_method_parameters_align_multiline = false
+ij_c_method_parameters_wrap = off
+ij_c_namespace_brace_placement = end_of_line
+ij_c_parentheses_expression_new_line_after_left_paren = false
+ij_c_parentheses_expression_right_paren_on_new_line = false
+ij_c_place_assignment_sign_on_next_line = false
+ij_c_property_nonatomic = true
+ij_c_put_ivars_to_implementation = true
+ij_c_refactor_compatibility_aliases_and_classes = true
+ij_c_refactor_properties_and_ivars = true
+ij_c_release_style = ivar
+ij_c_retain_object_parameters_in_constructor = true
+ij_c_semicolon_after_method_signature = false
+ij_c_shift_operation_align_multiline = true
+ij_c_shift_operation_wrap = normal
+ij_c_show_non_virtual_functions = false
+ij_c_space_after_colon = true
+ij_c_space_after_colon_in_selector = false
+ij_c_space_after_comma = true
+ij_c_space_after_cup_in_blocks = false
+ij_c_space_after_dictionary_literal_colon = true
+ij_c_space_after_for_semicolon = true
+ij_c_space_after_init_list_colon = true
+ij_c_space_after_method_parameter_type_parentheses = false
+ij_c_space_after_method_return_type_parentheses = false
+ij_c_space_after_pointer_in_declaration = false
+ij_c_space_after_quest = true
+ij_c_space_after_reference_in_declaration = false
+ij_c_space_after_reference_in_rvalue = false
+ij_c_space_after_structures_rbrace = true
+ij_c_space_after_superclass_colon = true
+ij_c_space_after_type_cast = true
+ij_c_space_after_visibility_sign_in_method_declaration = true
+ij_c_space_before_autorelease_pool_lbrace = true
+ij_c_space_before_catch_keyword = true
+ij_c_space_before_catch_left_brace = true
+ij_c_space_before_catch_parentheses = true
+ij_c_space_before_category_parentheses = true
+ij_c_space_before_chained_send_message = true
+ij_c_space_before_class_left_brace = true
+ij_c_space_before_colon = true
+ij_c_space_before_comma = false
+ij_c_space_before_dictionary_literal_colon = false
+ij_c_space_before_do_left_brace = true
+ij_c_space_before_else_keyword = true
+ij_c_space_before_else_left_brace = true
+ij_c_space_before_for_left_brace = true
+ij_c_space_before_for_parentheses = true
+ij_c_space_before_for_semicolon = false
+ij_c_space_before_if_left_brace = true
+ij_c_space_before_if_parentheses = true
+ij_c_space_before_init_list = false
+ij_c_space_before_init_list_colon = true
+ij_c_space_before_method_call_parentheses = false
+ij_c_space_before_method_left_brace = true
+ij_c_space_before_method_parentheses = false
+ij_c_space_before_namespace_lbrace = true
+ij_c_space_before_pointer_in_declaration = true
+ij_c_space_before_property_attributes_parentheses = false
+ij_c_space_before_protocols_brackets = true
+ij_c_space_before_quest = true
+ij_c_space_before_reference_in_declaration = true
+ij_c_space_before_superclass_colon = true
+ij_c_space_before_switch_left_brace = true
+ij_c_space_before_switch_parentheses = true
+ij_c_space_before_template_call_lt = false
+ij_c_space_before_template_declaration_lt = false
+ij_c_space_before_try_left_brace = true
+ij_c_space_before_while_keyword = true
+ij_c_space_before_while_left_brace = true
+ij_c_space_before_while_parentheses = true
+ij_c_space_between_adjacent_brackets = false
+ij_c_space_between_operator_and_punctuator = false
+ij_c_space_within_empty_array_initializer_braces = false
+ij_c_spaces_around_additive_operators = true
+ij_c_spaces_around_assignment_operators = true
+ij_c_spaces_around_bitwise_operators = true
+ij_c_spaces_around_equality_operators = true
+ij_c_spaces_around_lambda_arrow = true
+ij_c_spaces_around_logical_operators = true
+ij_c_spaces_around_multiplicative_operators = true
+ij_c_spaces_around_pm_operators = false
+ij_c_spaces_around_relational_operators = true
+ij_c_spaces_around_shift_operators = true
+ij_c_spaces_around_unary_operator = false
+ij_c_spaces_within_array_initializer_braces = false
+ij_c_spaces_within_braces = true
+ij_c_spaces_within_brackets = false
+ij_c_spaces_within_cast_parentheses = false
+ij_c_spaces_within_catch_parentheses = false
+ij_c_spaces_within_category_parentheses = false
+ij_c_spaces_within_empty_braces = false
+ij_c_spaces_within_empty_function_call_parentheses = false
+ij_c_spaces_within_empty_function_declaration_parentheses = false
+ij_c_spaces_within_empty_lambda_capture_list_bracket = false
+ij_c_spaces_within_empty_template_call_ltgt = false
+ij_c_spaces_within_empty_template_declaration_ltgt = false
+ij_c_spaces_within_for_parentheses = false
+ij_c_spaces_within_function_call_parentheses = false
+ij_c_spaces_within_function_declaration_parentheses = false
+ij_c_spaces_within_if_parentheses = false
+ij_c_spaces_within_lambda_capture_list_bracket = false
+ij_c_spaces_within_method_parameter_type_parentheses = false
+ij_c_spaces_within_method_return_type_parentheses = false
+ij_c_spaces_within_parentheses = false
+ij_c_spaces_within_property_attributes_parentheses = false
+ij_c_spaces_within_protocols_brackets = false
+ij_c_spaces_within_send_message_brackets = false
+ij_c_spaces_within_switch_parentheses = false
+ij_c_spaces_within_template_call_ltgt = false
+ij_c_spaces_within_template_declaration_ltgt = false
+ij_c_spaces_within_template_double_gt = true
+ij_c_spaces_within_while_parentheses = false
+ij_c_special_else_if_treatment = true
+ij_c_superclass_list_after_colon = never
+ij_c_superclass_list_align_multiline = true
+ij_c_superclass_list_before_colon = if_long
+ij_c_superclass_list_comma_on_next_line = false
+ij_c_superclass_list_wrap = on_every_item
+ij_c_tag_prefix_of_block_comment = at
+ij_c_tag_prefix_of_line_comment = back_slash
+ij_c_template_call_arguments_align_multiline = false
+ij_c_template_call_arguments_align_multiline_pars = false
+ij_c_template_call_arguments_comma_on_next_line = false
+ij_c_template_call_arguments_new_line_after_lt = false
+ij_c_template_call_arguments_new_line_before_gt = false
+ij_c_template_call_arguments_wrap = off
+ij_c_template_declaration_function_body_indent = false
+ij_c_template_declaration_function_wrap = split_into_lines
+ij_c_template_declaration_struct_body_indent = false
+ij_c_template_declaration_struct_wrap = split_into_lines
+ij_c_template_parameters_align_multiline = false
+ij_c_template_parameters_align_multiline_pars = false
+ij_c_template_parameters_comma_on_next_line = false
+ij_c_template_parameters_new_line_after_lt = false
+ij_c_template_parameters_new_line_before_gt = false
+ij_c_template_parameters_wrap = off
+ij_c_ternary_operation_signs_on_next_line = true
+ij_c_ternary_operation_wrap = normal
+ij_c_type_qualifiers_placement = before
+ij_c_use_modern_casts = true
+ij_c_use_setters_in_constructor = true
+ij_c_while_brace_force = never
+ij_c_while_on_new_line = false
+ij_c_wrap_property_declaration = off
+
+[{*.cmake,CMakeLists.txt}]
+ij_cmake_align_multiline_parameters_in_calls = false
+ij_cmake_force_commands_case = 2
+ij_cmake_keep_blank_lines_in_code = 2
+ij_cmake_space_before_for_parentheses = true
+ij_cmake_space_before_if_parentheses = true
+ij_cmake_space_before_method_call_parentheses = false
+ij_cmake_space_before_method_parentheses = false
+ij_cmake_space_before_while_parentheses = true
+ij_cmake_spaces_within_for_parentheses = false
+ij_cmake_spaces_within_if_parentheses = false
+ij_cmake_spaces_within_method_call_parentheses = false
+ij_cmake_spaces_within_method_parentheses = false
+ij_cmake_spaces_within_while_parentheses = false
+
+[{*.gant,*.gradle,*.groovy,*.gy}]
+ij_groovy_align_group_field_declarations = false
+ij_groovy_align_multiline_array_initializer_expression = false
+ij_groovy_align_multiline_assignment = false
+ij_groovy_align_multiline_binary_operation = false
+ij_groovy_align_multiline_chained_methods = false
+ij_groovy_align_multiline_extends_list = false
+ij_groovy_align_multiline_for = true
+ij_groovy_align_multiline_list_or_map = true
+ij_groovy_align_multiline_method_parentheses = false
+ij_groovy_align_multiline_parameters = true
+ij_groovy_align_multiline_parameters_in_calls = false
+ij_groovy_align_multiline_resources = true
+ij_groovy_align_multiline_ternary_operation = false
+ij_groovy_align_multiline_throws_list = false
+ij_groovy_align_named_args_in_map = true
+ij_groovy_align_throws_keyword = false
+ij_groovy_array_initializer_new_line_after_left_brace = false
+ij_groovy_array_initializer_right_brace_on_new_line = false
+ij_groovy_array_initializer_wrap = off
+ij_groovy_assert_statement_wrap = off
+ij_groovy_assignment_wrap = off
+ij_groovy_binary_operation_wrap = off
+ij_groovy_blank_lines_after_class_header = 0
+ij_groovy_blank_lines_after_imports = 1
+ij_groovy_blank_lines_after_package = 1
+ij_groovy_blank_lines_around_class = 1
+ij_groovy_blank_lines_around_field = 0
+ij_groovy_blank_lines_around_field_in_interface = 0
+ij_groovy_blank_lines_around_method = 1
+ij_groovy_blank_lines_around_method_in_interface = 1
+ij_groovy_blank_lines_before_imports = 1
+ij_groovy_blank_lines_before_method_body = 0
+ij_groovy_blank_lines_before_package = 0
+ij_groovy_block_brace_style = end_of_line
+ij_groovy_block_comment_at_first_column = true
+ij_groovy_call_parameters_new_line_after_left_paren = false
+ij_groovy_call_parameters_right_paren_on_new_line = false
+ij_groovy_call_parameters_wrap = off
+ij_groovy_catch_on_new_line = false
+ij_groovy_class_annotation_wrap = split_into_lines
+ij_groovy_class_brace_style = end_of_line
+ij_groovy_class_count_to_use_import_on_demand = 5
+ij_groovy_do_while_brace_force = never
+ij_groovy_else_on_new_line = false
+ij_groovy_enum_constants_wrap = off
+ij_groovy_extends_keyword_wrap = off
+ij_groovy_extends_list_wrap = off
+ij_groovy_field_annotation_wrap = split_into_lines
+ij_groovy_finally_on_new_line = false
+ij_groovy_for_brace_force = never
+ij_groovy_for_statement_new_line_after_left_paren = false
+ij_groovy_for_statement_right_paren_on_new_line = false
+ij_groovy_for_statement_wrap = off
+ij_groovy_if_brace_force = never
+ij_groovy_import_annotation_wrap = 2
+ij_groovy_imports_layout = *,|,javax.**,java.**,|,$*
+ij_groovy_indent_case_from_switch = true
+ij_groovy_indent_label_blocks = true
+ij_groovy_insert_inner_class_imports = false
+ij_groovy_keep_blank_lines_before_right_brace = 2
+ij_groovy_keep_blank_lines_in_code = 2
+ij_groovy_keep_blank_lines_in_declarations = 2
+ij_groovy_keep_control_statement_in_one_line = true
+ij_groovy_keep_first_column_comment = true
+ij_groovy_keep_indents_on_empty_lines = false
+ij_groovy_keep_line_breaks = true
+ij_groovy_keep_multiple_expressions_in_one_line = false
+ij_groovy_keep_simple_blocks_in_one_line = false
+ij_groovy_keep_simple_classes_in_one_line = true
+ij_groovy_keep_simple_lambdas_in_one_line = true
+ij_groovy_keep_simple_methods_in_one_line = true
+ij_groovy_label_indent_absolute = false
+ij_groovy_label_indent_size = 0
+ij_groovy_lambda_brace_style = end_of_line
+ij_groovy_layout_static_imports_separately = true
+ij_groovy_line_comment_add_space = false
+ij_groovy_line_comment_at_first_column = true
+ij_groovy_method_annotation_wrap = split_into_lines
+ij_groovy_method_brace_style = end_of_line
+ij_groovy_method_call_chain_wrap = off
+ij_groovy_method_parameters_new_line_after_left_paren = false
+ij_groovy_method_parameters_right_paren_on_new_line = false
+ij_groovy_method_parameters_wrap = off
+ij_groovy_modifier_list_wrap = false
+ij_groovy_names_count_to_use_import_on_demand = 3
+ij_groovy_parameter_annotation_wrap = off
+ij_groovy_parentheses_expression_new_line_after_left_paren = false
+ij_groovy_parentheses_expression_right_paren_on_new_line = false
+ij_groovy_prefer_parameters_wrap = false
+ij_groovy_resource_list_new_line_after_left_paren = false
+ij_groovy_resource_list_right_paren_on_new_line = false
+ij_groovy_resource_list_wrap = off
+ij_groovy_space_after_assert_separator = true
+ij_groovy_space_after_colon = true
+ij_groovy_space_after_comma = true
+ij_groovy_space_after_comma_in_type_arguments = true
+ij_groovy_space_after_for_semicolon = true
+ij_groovy_space_after_quest = true
+ij_groovy_space_after_type_cast = true
+ij_groovy_space_before_annotation_parameter_list = false
+ij_groovy_space_before_array_initializer_left_brace = false
+ij_groovy_space_before_assert_separator = false
+ij_groovy_space_before_catch_keyword = true
+ij_groovy_space_before_catch_left_brace = true
+ij_groovy_space_before_catch_parentheses = true
+ij_groovy_space_before_class_left_brace = true
+ij_groovy_space_before_closure_left_brace = true
+ij_groovy_space_before_colon = true
+ij_groovy_space_before_comma = false
+ij_groovy_space_before_do_left_brace = true
+ij_groovy_space_before_else_keyword = true
+ij_groovy_space_before_else_left_brace = true
+ij_groovy_space_before_finally_keyword = true
+ij_groovy_space_before_finally_left_brace = true
+ij_groovy_space_before_for_left_brace = true
+ij_groovy_space_before_for_parentheses = true
+ij_groovy_space_before_for_semicolon = false
+ij_groovy_space_before_if_left_brace = true
+ij_groovy_space_before_if_parentheses = true
+ij_groovy_space_before_method_call_parentheses = false
+ij_groovy_space_before_method_left_brace = true
+ij_groovy_space_before_method_parentheses = false
+ij_groovy_space_before_quest = true
+ij_groovy_space_before_switch_left_brace = true
+ij_groovy_space_before_switch_parentheses = true
+ij_groovy_space_before_synchronized_left_brace = true
+ij_groovy_space_before_synchronized_parentheses = true
+ij_groovy_space_before_try_left_brace = true
+ij_groovy_space_before_try_parentheses = true
+ij_groovy_space_before_while_keyword = true
+ij_groovy_space_before_while_left_brace = true
+ij_groovy_space_before_while_parentheses = true
+ij_groovy_space_in_named_argument = true
+ij_groovy_space_in_named_argument_before_colon = false
+ij_groovy_space_within_empty_array_initializer_braces = false
+ij_groovy_space_within_empty_method_call_parentheses = false
+ij_groovy_spaces_around_additive_operators = true
+ij_groovy_spaces_around_assignment_operators = true
+ij_groovy_spaces_around_bitwise_operators = true
+ij_groovy_spaces_around_equality_operators = true
+ij_groovy_spaces_around_lambda_arrow = true
+ij_groovy_spaces_around_logical_operators = true
+ij_groovy_spaces_around_multiplicative_operators = true
+ij_groovy_spaces_around_regex_operators = true
+ij_groovy_spaces_around_relational_operators = true
+ij_groovy_spaces_around_shift_operators = true
+ij_groovy_spaces_within_annotation_parentheses = false
+ij_groovy_spaces_within_array_initializer_braces = false
+ij_groovy_spaces_within_braces = true
+ij_groovy_spaces_within_brackets = false
+ij_groovy_spaces_within_cast_parentheses = false
+ij_groovy_spaces_within_catch_parentheses = false
+ij_groovy_spaces_within_for_parentheses = false
+ij_groovy_spaces_within_gstring_injection_braces = false
+ij_groovy_spaces_within_if_parentheses = false
+ij_groovy_spaces_within_list_or_map = false
+ij_groovy_spaces_within_method_call_parentheses = false
+ij_groovy_spaces_within_method_parentheses = false
+ij_groovy_spaces_within_parentheses = false
+ij_groovy_spaces_within_switch_parentheses = false
+ij_groovy_spaces_within_synchronized_parentheses = false
+ij_groovy_spaces_within_try_parentheses = false
+ij_groovy_spaces_within_tuple_expression = false
+ij_groovy_spaces_within_while_parentheses = false
+ij_groovy_special_else_if_treatment = true
+ij_groovy_ternary_operation_wrap = off
+ij_groovy_throws_keyword_wrap = off
+ij_groovy_throws_list_wrap = off
+ij_groovy_use_flying_geese_braces = false
+ij_groovy_use_fq_class_names = false
+ij_groovy_use_fq_class_names_in_javadoc = true
+ij_groovy_use_relative_indents = false
+ij_groovy_use_single_class_imports = true
+ij_groovy_variable_annotation_wrap = off
+ij_groovy_while_brace_force = never
+ij_groovy_while_on_new_line = false
+ij_groovy_wrap_long_lines = false
+
+[{*.gradle.kts,*.kt,*.kts,*.main.kts}]
+ij_kotlin_align_in_columns_case_branch = true
+ij_kotlin_align_multiline_binary_operation = false
+ij_kotlin_align_multiline_extends_list = false
+ij_kotlin_align_multiline_method_parentheses = false
+ij_kotlin_align_multiline_parameters = true
+ij_kotlin_align_multiline_parameters_in_calls = false
+ij_kotlin_allow_trailing_comma = false
+ij_kotlin_allow_trailing_comma_on_call_site = false
+ij_kotlin_assignment_wrap = off
+ij_kotlin_blank_lines_after_class_header = 0
+ij_kotlin_blank_lines_around_block_when_branches = 0
+ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1
+ij_kotlin_block_comment_at_first_column = true
+ij_kotlin_call_parameters_new_line_after_left_paren = false
+ij_kotlin_call_parameters_right_paren_on_new_line = false
+ij_kotlin_call_parameters_wrap = off
+ij_kotlin_catch_on_new_line = false
+ij_kotlin_class_annotation_wrap = off
+ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
+ij_kotlin_continuation_indent_for_chained_calls = true
+ij_kotlin_continuation_indent_for_expression_bodies = true
+ij_kotlin_continuation_indent_in_argument_lists = true
+ij_kotlin_continuation_indent_in_elvis = true
+ij_kotlin_continuation_indent_in_if_conditions = true
+ij_kotlin_continuation_indent_in_parameter_lists = true
+ij_kotlin_continuation_indent_in_supertype_lists = true
+ij_kotlin_else_on_new_line = false
+ij_kotlin_enum_constants_wrap = off
+ij_kotlin_extends_list_wrap = off
+ij_kotlin_field_annotation_wrap = normal
+ij_kotlin_finally_on_new_line = false
+ij_kotlin_if_rparen_on_new_line = false
+ij_kotlin_import_nested_classes = false
+ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
+ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
+ij_kotlin_keep_blank_lines_before_right_brace = 0
+ij_kotlin_keep_blank_lines_in_code = 1
+ij_kotlin_keep_blank_lines_in_declarations = 1
+ij_kotlin_keep_first_column_comment = true
+ij_kotlin_keep_indents_on_empty_lines = false
+ij_kotlin_keep_line_breaks = true
+ij_kotlin_lbrace_on_next_line = false
+ij_kotlin_line_comment_add_space = false
+ij_kotlin_line_comment_at_first_column = true
+ij_kotlin_method_annotation_wrap = split_into_lines
+ij_kotlin_method_call_chain_wrap = off
+ij_kotlin_method_parameters_new_line_after_left_paren = false
+ij_kotlin_method_parameters_right_paren_on_new_line = false
+ij_kotlin_method_parameters_wrap = off
+ij_kotlin_name_count_to_use_star_import = 2147483647
+ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
+ij_kotlin_packages_to_use_import_on_demand = kotlinx.android.synthetic.**
+ij_kotlin_parameter_annotation_wrap = off
+ij_kotlin_space_after_comma = true
+ij_kotlin_space_after_extend_colon = true
+ij_kotlin_space_after_type_colon = true
+ij_kotlin_space_before_catch_parentheses = true
+ij_kotlin_space_before_comma = false
+ij_kotlin_space_before_extend_colon = true
+ij_kotlin_space_before_for_parentheses = true
+ij_kotlin_space_before_if_parentheses = true
+ij_kotlin_space_before_lambda_arrow = true
+ij_kotlin_space_before_type_colon = false
+ij_kotlin_space_before_when_parentheses = true
+ij_kotlin_space_before_while_parentheses = true
+ij_kotlin_spaces_around_additive_operators = true
+ij_kotlin_spaces_around_assignment_operators = true
+ij_kotlin_spaces_around_equality_operators = true
+ij_kotlin_spaces_around_function_type_arrow = true
+ij_kotlin_spaces_around_logical_operators = true
+ij_kotlin_spaces_around_multiplicative_operators = true
+ij_kotlin_spaces_around_range = false
+ij_kotlin_spaces_around_relational_operators = true
+ij_kotlin_spaces_around_unary_operator = false
+ij_kotlin_spaces_around_when_arrow = true
+ij_kotlin_use_custom_formatting_for_modifiers = true
+ij_kotlin_variable_annotation_wrap = off
+ij_kotlin_while_on_new_line = false
+ij_kotlin_wrap_elvis_expressions = 1
+ij_kotlin_wrap_expression_body_functions = 0
+ij_kotlin_wrap_first_method_in_call_chain = false
+
+[{*.har,*.json}]
+indent_size = 2
+ij_json_keep_blank_lines_in_code = 0
+ij_json_keep_indents_on_empty_lines = false
+ij_json_keep_line_breaks = true
+ij_json_space_after_colon = true
+ij_json_space_after_comma = true
+ij_json_space_before_colon = true
+ij_json_space_before_comma = false
+ij_json_spaces_within_braces = false
+ij_json_spaces_within_brackets = false
+ij_json_wrap_long_lines = false
+
+[{*.htm,*.html,*.sht,*.shtm,*.shtml}]
+ij_html_add_new_line_before_tags = body,div,p,form,h1,h2,h3
+ij_html_align_attributes = true
+ij_html_align_text = false
+ij_html_attribute_wrap = normal
+ij_html_block_comment_at_first_column = true
+ij_html_do_not_align_children_of_min_lines = 0
+ij_html_do_not_break_if_inline_tags = title,h1,h2,h3,h4,h5,h6,p
+ij_html_do_not_indent_children_of_tags = html,body,thead,tbody,tfoot
+ij_html_enforce_quotes = false
+ij_html_inline_tags = a,abbr,acronym,b,basefont,bdo,big,br,cite,cite,code,dfn,em,font,i,img,input,kbd,label,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var
+ij_html_keep_blank_lines = 2
+ij_html_keep_indents_on_empty_lines = false
+ij_html_keep_line_breaks = true
+ij_html_keep_line_breaks_in_text = true
+ij_html_keep_whitespaces = false
+ij_html_keep_whitespaces_inside = span,pre,textarea
+ij_html_line_comment_at_first_column = true
+ij_html_new_line_after_last_attribute = never
+ij_html_new_line_before_first_attribute = never
+ij_html_quote_style = double
+ij_html_remove_new_line_before_tags = br
+ij_html_space_after_tag_name = false
+ij_html_space_around_equality_in_attribute = false
+ij_html_space_inside_empty_tag = false
+ij_html_text_wrap = normal
+ij_html_uniform_ident = false
+
+[{*.yaml,*.yml}]
+indent_size = 2
+ij_yaml_align_values_properties = do_not_align
+ij_yaml_autoinsert_sequence_marker = true
+ij_yaml_block_mapping_on_new_line = false
+ij_yaml_indent_sequence_value = true
+ij_yaml_keep_indents_on_empty_lines = false
+ij_yaml_keep_line_breaks = true
+ij_yaml_sequence_on_new_line = false
+ij_yaml_space_before_colon = false
+ij_yaml_spaces_within_braces = true
+ij_yaml_spaces_within_brackets = true
diff --git a/.github/ISSUE_TEMPLATE/release.yml b/.github/ISSUE_TEMPLATE/release.yml
index c22b00e2e9..7cb47fa952 100644
--- a/.github/ISSUE_TEMPLATE/release.yml
+++ b/.github/ISSUE_TEMPLATE/release.yml
@@ -23,7 +23,8 @@ body:
 
         ### Do the release
 
-        - [ ] Create release with gitflow, branch name `release/1.2.3`
+        - [ ] Make sure `develop` and `main` are up to date (git pull)
+        - [ ] Checkout develop and create a release with gitflow, branch name `release/1.2.3`
         - [ ] Check the crashes from the PlayStore
         - [ ] Check the rageshake with the current dev version: https://github.com/matrix-org/element-android-rageshakes/labels/1.2.3-dev
         - [ ] Run the integration test, and especially `UiAllScreensSanityTest.allScreensTest()`
@@ -106,7 +107,7 @@ body:
 
         https://github.com/matrix-org/matrix-android-sdk2-sample
 
-        - [ ] Update the dependency to the new version of the SDK2. It can take some time for MavenCentral to make the librarie available. You can check status on https://repo1.maven.org/maven2/org/matrix/android/matrix-android-sdk2/
+        - [ ] Update the dependency to the new version of the SDK2. It can take a few minutes for MavenCentral to make the library available. You can check status on https://repo1.maven.org/maven2/org/matrix/android/matrix-android-sdk2/
         - [ ] Build and run the sample, you may have to fix some API break
         - [ ] Commit and push directly on `main`
     validations:
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 0573461e7a..b6746c77d3 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -10,6 +10,8 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    reviewers:
+      - "vector-im/element-android-reviewers"
     ignore:
       - dependency-name: "*github-script*"
   # Updates for Gradle dependencies used in the app
@@ -19,6 +21,6 @@ updates:
       interval: "daily"
     open-pull-requests-limit: 200
     reviewers:
-      - "bmarty"
+      - "vector-im/element-android-reviewers"
     ignore:
       - dependency-name: com.google.zxing:core
diff --git a/.github/workflows/nightly.yml b/.github/workflows/post-pr.yml
similarity index 83%
rename from .github/workflows/nightly.yml
rename to .github/workflows/post-pr.yml
index 84122095c6..553146acc1 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/post-pr.yml
@@ -1,28 +1,43 @@
-name: Nightly Tests
+name: Integration Tests
+
+# This runs for all closed pull requests against main, including those closed without merge.
+# Further filtering occurs in 'should-i-run'
 
 on:
-  push:
-    branches: [ release/* ]
-  schedule:
-    # At 20:00 every day UTC
-    - cron: '0 20 * * *'
-  workflow_dispatch:
+  pull_request:
+    types: [closed]
+    branches: [develop]
 
 # Enrich gradle.properties for CI/CD
 env:
   CI_GRADLE_ARG_PROPERTIES: >
     -Porg.gradle.jvmargs=-Xmx4g
     -Porg.gradle.parallel=false
+
 jobs:
+
+  # More info on should-i-run:
+  # If this fails to run (the IF doesn't complete) then the needs will not be satisfied for any of the 
+  # other jobs below, so none will run.
+  # except for the notification job at the bottom which will run all the time, unless should-i-run isn't
+  # successful, or all the other jobs have succeeded
+
+  should-i-run:
+    name: Check if PR is suitable for analysis
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.merged # Additionally require PR to have been completely merged.
+    steps:
+      - run: echo "Run those tests!" # no-op success
+        
   # Run Android Tests
   integration-tests:
     name: Matrix SDK - Running Integration Tests
+    needs: should-i-run
     runs-on: macos-latest
     strategy:
       fail-fast: false
       matrix:
         api-level: [ 28 ]
-    # No concurrency required, runs every time on a schedule.
     steps:
       - uses: actions/checkout@v3
       - uses: gradle/wrapper-validation-action@v1
@@ -43,11 +58,12 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Start synapse server
-        uses: michaelkaye/setup-matrix-synapse@v1.0.1
+        uses: michaelkaye/setup-matrix-synapse@v1.0.3
         with:
           uploadLogs: true
           httpPort: 8080
           disableRateLimiting: true
+          public_baseurl: "http://10.0.2.2:8080/"
       # package: org.matrix.android.sdk.session
       - name: Run integration tests for  Matrix SDK [org.matrix.android.sdk.session] API[${{ matrix.api-level }}]
         uses: reactivecircus/android-emulator-runner@v2
@@ -209,6 +225,7 @@ jobs:
 
   ui-tests:
     name: UI Tests (Synapse)
+    needs: should-i-run
     runs-on: macos-latest
     strategy:
       fail-fast: false
@@ -230,11 +247,12 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Start synapse server
-        uses: michaelkaye/setup-matrix-synapse@v1.0.1
+        uses: michaelkaye/setup-matrix-synapse@v1.0.3
         with:
           uploadLogs: true
           httpPort: 8080
           disableRateLimiting: true
+          public_baseurl: "http://10.0.2.2:8080/"
       - uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
@@ -266,6 +284,7 @@ jobs:
 
   codecov-units:
     name: Unit tests with code coverage
+    needs: should-i-run
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
@@ -290,50 +309,21 @@ jobs:
           path: |
             build/reports/jacoco/allCodeCoverageReport/allCodeCoverageReport.xml
 
-  sonarqube:
-    name: Sonarqube upload
-    runs-on: macos-latest
-    if: always() && github.event_name == 'schedule'
-    needs:
-      - codecov-units
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'adopt'
-          java-version: '11'
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - uses: actions/download-artifact@v3
-        with:
-          name: codecov-xml # will restore to allCodeCoverageReport.xml by default; we restore to the same location in following tasks
-      - run: mkdir -p build/reports/jacoco/allCodeCoverageReport/
-      - run: mv allCodeCoverageReport.xml build/reports/jacoco/allCodeCoverageReport/
-      - run: ./gradlew sonarqube $CI_GRADLE_ARG_PROPERTIES
-        env:
-          ORG_GRADLE_PROJECT_SONAR_LOGIN: ${{ secrets.SONAR_TOKEN }}
-
-# Notify the channel about scheduled runs, or pushes to the release branches, do not notify for manually triggered runs
+# Notify the channel about delayed failures
   notify:
     name: Notify matrix
     runs-on: ubuntu-latest
     needs:
+      - should-i-run
       - integration-tests
       - ui-tests
-      - sonarqube
-    if: always() && github.event_name != 'workflow_dispatch'
+      - codecov-units
+    if: always() && (needs.should-i-run.status == 'success' ) && ((needs.codecov-units.status != 'success' ) || (needs.ui-tests.status != 'success') || (needs.integration-tests.status != 'success'))
     # No concurrency required, runs every time on a schedule.
     steps:
-      - uses: michaelkaye/matrix-hookshot-action@v0.3.0
+      - uses: michaelkaye/matrix-hookshot-action@v1.0.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          matrix_access_token: ${{ secrets.ELEMENT_ANDROID_NOTIFICATION_ACCESS_TOKEN }}
-          matrix_room_id: ${{ secrets.ELEMENT_ANDROID_INTERNAL_ROOM_ID }}
-          text_template: "{{#if '${{ github.event_name }}' == 'schedule' }}Nightly test run{{else}}Test run (on ${{ github.ref }}){{/if }}: {{#each job_statuses }}{{#with this }}{{#if completed }}  {{name}} {{conclusion}} at {{completed_at}}, {{/if}}{{/with}}{{/each}}"
-          html_template: "{{#if '${{ github.event_name }}' == 'schedule' }}Nightly test run{{else}}Test run (on ${{ github.ref }}){{/if }}: {{#each job_statuses }}{{#with this }}{{#if completed }}<br />{{icon conclusion}} {{name}} <font color='{{color conclusion}}'>{{conclusion}} at {{completed_at}} <a href=\"{{html_url}}\">[details]</a></font>{{/if}}{{/with}}{{/each}}"
+          hookshot_url: ${{ secrets.ELEMENT_ANDROID_HOOKSHOT_URL }}
+          text_template: "Post-merge validation of ${{ github.head_ref }} into ${{ github.base_ref }} by ${{ github.event.merged_by }} failed: {{#each job_statuses }}{{#with this }}{{#if completed }}  {{name}} {{conclusion}} at {{completed_at}}, {{/if}}{{/with}}{{/each}}"
+          html_template: "Post-merge validation of ${{ github.head_ref }} into ${{ github.base_ref }} by ${{ github.event.merged_by }} failed: {{#each job_statuses }}{{#with this }}{{#if completed }}<br />{{icon conclusion}} {{name}} <font color='{{color conclusion}}'>{{conclusion}} at {{completed_at}} <a href=\"{{html_url}}\">[details]</a></font>{{/if}}{{/with}}{{/each}}"
diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
new file mode 100644
index 0000000000..ea4c3d594b
--- /dev/null
+++ b/.github/workflows/sonarqube.yml
@@ -0,0 +1,81 @@
+name: Sonarqube nightly
+
+on:
+  schedule:
+    - cron: '0 20 * * *'
+
+# Enrich gradle.properties for CI/CD
+env:
+  CI_GRADLE_ARG_PROPERTIES: >
+    -Porg.gradle.jvmargs=-Xmx4g
+    -Porg.gradle.parallel=false
+jobs:
+  codecov-units:
+    name: Unit tests with code coverage
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with: 
+          distribution: 'adopt'
+          java-version: '11'
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - run: ./gradlew allCodeCoverageReport $CI_GRADLE_ARG_PROPERTIES
+      - name: Upload Codecov data
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: codecov-xml
+          path: |
+            build/reports/jacoco/allCodeCoverageReport/allCodeCoverageReport.xml
+
+  sonarqube:
+    name: Sonarqube upload
+    runs-on: ubuntu-latest
+    needs:
+      - codecov-units
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'adopt'
+          java-version: '11'
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - uses: actions/download-artifact@v3
+        with:
+          name: codecov-xml # will restore to allCodeCoverageReport.xml by default; we restore to the same location in following tasks
+      - run: mkdir -p build/reports/jacoco/allCodeCoverageReport/
+      - run: mv allCodeCoverageReport.xml build/reports/jacoco/allCodeCoverageReport/
+      - run: ./gradlew sonarqube $CI_GRADLE_ARG_PROPERTIES
+        env:
+          ORG_GRADLE_PROJECT_SONAR_LOGIN: ${{ secrets.SONAR_TOKEN }}
+
+# Notify the channel about sonarqube failures
+  notify:
+    name: Notify matrix
+    runs-on: ubuntu-latest
+    needs:
+      - sonarqube
+      - codecov-units
+    if: always() && (needs.sonarqube.result != "success" || needs.codecov-units.result != "success") 
+    steps:
+      - uses: michaelkaye/matrix-hookshot-action@v1.0.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          hookshot_url: ${{ secrets.ELEMENT_ANDROID_HOOKSHOT_URL }}
+          text_template: "Sonarqube run (on ${{ github.ref }}): {{#each job_statuses }}{{#with this }}{{#if completed }}  {{name}} {{conclusion}} at {{completed_at}}, {{/if}}{{/with}}{{/each}}"
+          html_template: "Sonarqube run (on ${{ github.ref }}): {{#each job_statuses }}{{#with this }}{{#if completed }}<br />{{icon conclusion}} {{name}} <font color='{{color conclusion}}'>{{conclusion}} at {{completed_at}} <a href=\"{{html_url}}\">[details]</a></font>{{/if}}{{/with}}{{/each}}"
diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml
index eeddf2e785..82d5931ce7 100644
--- a/.github/workflows/triage-labelled.yml
+++ b/.github/workflows/triage-labelled.yml
@@ -11,7 +11,6 @@ jobs:
     if: >
         contains(github.event.issue.labels.*.name, 'A-Maths') ||
         contains(github.event.issue.labels.*.name, 'A-Message-Pinning') ||
-        contains(github.event.issue.labels.*.name, 'A-Threads') ||
         contains(github.event.issue.labels.*.name, 'A-Polls') ||
         contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
         contains(github.event.issue.labels.*.name, 'A-Message-Bubbles') ||
@@ -252,3 +251,30 @@ jobs:
         env:
           PROJECT_ID: "PN_kwDOAM0swc4AArk0"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  move_element_x_issues:
+    name: ElementX issues to ElementX project board
+    runs-on: ubuntu-latest
+    # Skip in forks
+    if: >
+      github.repository == 'vector-im/element-android' &&
+      (contains(github.event.issue.labels.*.name, 'Z-ElementX-Alpha') ||
+        contains(github.event.issue.labels.*.name, 'Z-ElementX-Beta') ||
+        contains(github.event.issue.labels.*.name, 'Z-ElementX'))
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:ID!,$contentid:ID!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAM0swc4ABTXY"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
diff --git a/.github/workflows/triage-move-review-requests.yml b/.github/workflows/triage-move-review-requests.yml
index 75738a53a9..61f1f114dd 100644
--- a/.github/workflows/triage-move-review-requests.yml
+++ b/.github/workflows/triage-move-review-requests.yml
@@ -7,6 +7,8 @@ jobs:
   add_design_pr_to_project:
     name: Move PRs asking for design review to the design board
     runs-on: ubuntu-latest
+    # Skip in forks
+    if: github.repository == 'vector-im/element-android'
     steps:
       - uses: octokit/graphql-action@v2.x
         id: find_team_members
@@ -74,6 +76,8 @@ jobs:
   add_product_pr_to_project:
     name: Move PRs asking for product review to the product board
     runs-on: ubuntu-latest
+    # Skip in forks
+    if: github.repository == 'vector-im/element-android'
     steps:
       - uses: octokit/graphql-action@v2.x
         id: find_team_members
diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index 1cbf29cc8d..63aaae15a5 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -13,6 +13,8 @@ jobs:
 
       - name: Update Gradle Wrapper
         uses: gradle-update/update-gradle-wrapper-action@v1
+        # Skip in forks
+        if: github.repository == 'vector-im/element-android'
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           target-branch: develop
diff --git a/CHANGES.md b/CHANGES.md
index 47b8c57041..8e42149545 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,128 @@
+Changes in Element v1.4.14 (2022-05-05)
+=======================================
+
+Features ✨
+----------
+ - Improve management of ignored users ([#5772](https://github.com/vector-im/element-android/issues/5772))
+ - VoIP Screen Sharing Permission ([#5811](https://github.com/vector-im/element-android/issues/5811))
+ - Live location sharing: updating beacon state event content structure ([#5814](https://github.com/vector-im/element-android/issues/5814))
+
+Bugfixes 🐛
+----------
+ - Fixes crash when accepting or receiving VOIP calls ([#5421](https://github.com/vector-im/element-android/issues/5421))
+ - Improve/fix crashes on messages decryption ([#5592](https://github.com/vector-im/element-android/issues/5592))
+ - Tentative fix of images crashing when being sent or shared from gallery ([#5652](https://github.com/vector-im/element-android/issues/5652))
+ - Improving deactivation experience along with a crash fix ([#5721](https://github.com/vector-im/element-android/issues/5721))
+ - Adds missing suggested tag for rooms in Explore Space ([#5826](https://github.com/vector-im/element-android/issues/5826))
+ - Fixes missing call icons when threads are enabled ([#5847](https://github.com/vector-im/element-android/issues/5847))
+ - Fix UX freezing when creating secure backup ([#5871](https://github.com/vector-im/element-android/issues/5871))
+ - Fixes sign in via other requiring homeserver registration to be enabled ([#5874](https://github.com/vector-im/element-android/issues/5874))
+ - Don't pause timer when call is held. ([#5885](https://github.com/vector-im/element-android/issues/5885))
+ - Fix UISIDetector grace period bug ([#5886](https://github.com/vector-im/element-android/issues/5886))
+ - Fix a crash with space invitations in the space list, and do not display space invitation twice. ([#5924](https://github.com/vector-im/element-android/issues/5924))
+ - Fixes crash on android api 21/22 devices when opening messages due to Konfetti library ([#5925](https://github.com/vector-im/element-android/issues/5925))
+
+In development 🚧
+----------------
+ - Reorders the registration steps to prioritise email, then terms for the FTUE onboarding ([#5783](https://github.com/vector-im/element-android/issues/5783))
+ - [Live location sharing] Improve aggregation process of events ([#5862](https://github.com/vector-im/element-android/issues/5862))
+
+Improved Documentation 📚
+------------------------
+ - Update the PR process doc with 2 reviewers and a new reviewer team. ([#5836](https://github.com/vector-im/element-android/issues/5836))
+ - Improve documentation of the project and of the SDK ([#5854](https://github.com/vector-im/element-android/issues/5854))
+
+SDK API changes ⚠️
+------------------
+ - Added registrationCustom into RegistrationWizard to send custom auth params for sign up
+ - Moved terms converter into api package to make it accessible in sdk ([#5575](https://github.com/vector-im/element-android/issues/5575))
+ - Move package `org.matrix.android.sdk.api.pushrules` to `org.matrix.android.sdk.api.session.pushrules` ([#5812](https://github.com/vector-im/element-android/issues/5812))
+ - Some `Session` apis are now available by requesting the service first. For instance `Session.updateAvatar(...)` is now `Session.profileService().updateAvatar(...)`
+ - The shortcut `Room.search()` has been removed, you have to use `Session.searchService().search()` ([#5816](https://github.com/vector-im/element-android/issues/5816))
+ - Add return type to RoomApi.sendStateEvent() to retrieve the created event id ([#5855](https://github.com/vector-im/element-android/issues/5855))
+ - `Room` apis are now available by requesting the service first. For instance `Room.updateAvatar(...)` is now `Room.stateService().updateAvatar(...)` ([#5858](https://github.com/vector-im/element-android/issues/5858))
+ - Remove unecessary field `eventId` from `EventAnnotationsSummary` and `ReferencesAggregatedSummary` ([#5890](https://github.com/vector-im/element-android/issues/5890))
+ - Replace usage of `System.currentTimeMillis()` by a `Clock` interface ([#5907](https://github.com/vector-im/element-android/issues/5907))
+
+Other changes
+-------------
+ - Move "Ignored users" setting section into "Security & Privacy" ([#5773](https://github.com/vector-im/element-android/issues/5773))
+ - Add a picto for ignored users in the room member list screen ([#5774](https://github.com/vector-im/element-android/issues/5774))
+ - Autoformats entire project ([#5805](https://github.com/vector-im/element-android/issues/5805))
+ - Add a GH workflow to push ElementX issues to the global board. ([#5832](https://github.com/vector-im/element-android/issues/5832))
+ - Faster Olm decrypt when there is a lot of existing sessions ([#5872](https://github.com/vector-im/element-android/issues/5872))
+
+
+Changes in Element 1.4.13 (2022-04-26)
+======================================
+
+Bugfixes 🐛
+----------
+ - Fix UI freeze observed after each incremental sync ([#5835](https://github.com/vector-im/element-android/issues/5835))
+
+
+Changes in Element v1.4.12 (2022-04-20)
+=======================================
+
+Features ✨
+----------
+ - Add a setting to be able to always appear offline ([#5582](https://github.com/vector-im/element-android/issues/5582))
+ - Adds the ability for audio attachments to be played in the timeline ([#5586](https://github.com/vector-im/element-android/issues/5586))
+ - Do not cancel the current incremental sync request and treatment when the app goes to background ([#5719](https://github.com/vector-im/element-android/issues/5719))
+ - Improve user experience when home servers do not yet support threads ([#5761](https://github.com/vector-im/element-android/issues/5761))
+
+Bugfixes 🐛
+----------
+ - Added text next to spinner when loading information after user is clicked on space members screen ([#4305](https://github.com/vector-im/element-android/issues/4305))
+ - The string `ftue_auth_carousel_workplace_body` was declared not translatable by mistake ([#5262](https://github.com/vector-im/element-android/issues/5262))
+ - Fix some cases where the read marker line would not show up ([#5475](https://github.com/vector-im/element-android/issues/5475))
+ - Fix sometimes read marker not properly updating ([#5481](https://github.com/vector-im/element-android/issues/5481))
+ - Fix sometimes endless loading timeline ([#5554](https://github.com/vector-im/element-android/issues/5554))
+ - Use member name instead of room name in DM creation item ([#5570](https://github.com/vector-im/element-android/issues/5570))
+ - Align auto-reporting of decryption errors implementation with web client. ([#5596](https://github.com/vector-im/element-android/issues/5596))
+ - Choosing "leave all rooms and spaces" while leaving Space won't cause leaving DMs in this Space anymore ([#5609](https://github.com/vector-im/element-android/issues/5609))
+ - Fixes display name being changed when using /myroomnick ([#5618](https://github.com/vector-im/element-android/issues/5618))
+ - Fix endless loading if the event from a permalink is not found ([#5659](https://github.com/vector-im/element-android/issues/5659))
+ - Redacted events are no longer visible. ([#5707](https://github.com/vector-im/element-android/issues/5707))
+ - Don't wrongly show non-space invites in the space panel. ([#5731](https://github.com/vector-im/element-android/issues/5731))
+ - Fixes the onboarding confetti rendering behind the content instead of in-front ([#5735](https://github.com/vector-im/element-android/issues/5735))
+ - Fixes crash when navigating the app whilst processing new room keys ([#5746](https://github.com/vector-im/element-android/issues/5746))
+ - Fix sorting of uploads in encrypted rooms ([#5757](https://github.com/vector-im/element-android/issues/5757))
+ - Fixing setting transfer title in call transfer. ([#5765](https://github.com/vector-im/element-android/issues/5765))
+ - Changes destination after joining a space to Explore Space Rooms screen ([#5766](https://github.com/vector-im/element-android/issues/5766))
+ - Unignoring a user will perform an initial sync ([#5767](https://github.com/vector-im/element-android/issues/5767))
+ - Open a room by link: use the actual roomId instead of the alias ([#5786](https://github.com/vector-im/element-android/issues/5786))
+
+In development 🚧
+----------------
+ - FTUE - Adds a new homeserver selection screen when creating an account ([#2396](https://github.com/vector-im/element-android/issues/2396))
+ - FTUE - Updates the Captcha and T&Cs registration screens UI style ([#5279](https://github.com/vector-im/element-android/issues/5279))
+ - FTUE - Adds error handling within the server selection screen ([#5749](https://github.com/vector-im/element-android/issues/5749))
+ - Live Location Sharing - Send location data ([#5697](https://github.com/vector-im/element-android/issues/5697))
+ - Live Location Sharing - Show message on start of a live ([#5710](https://github.com/vector-im/element-android/issues/5710))
+ - Live Location Sharing - Attach location data to beacon info state event ([#5711](https://github.com/vector-im/element-android/issues/5711))
+ - Live Location Sharing - Update beacon info state event when sharing is ended ([#5758](https://github.com/vector-im/element-android/issues/5758))
+
+
+SDK API changes ⚠️
+------------------
+ - Include original event in live decryption listeners and update sync status naming to InitialSyncProgressing for clarity. ([#5639](https://github.com/vector-im/element-android/issues/5639))
+ - KeysBackupService.getCurrentVersion takes a new type `KeysBackupLastVersionResult` in the callback. ([#5703](https://github.com/vector-im/element-android/issues/5703))
+ - A lot of classes which were exposed to the clients and were located in the package `org.matrix.android.sdk.internal` have been moved to the package `org.matrix.android.sdk.api`.
+  All the classes which are in the package `org.matrix.android.sdk.internal` should now be declared `internal`.
+  Some unused code and classes have been removed. ([#5744](https://github.com/vector-im/element-android/issues/5744))
+ - Some data classes are now immutable, using `val` instead of `var` ([#5762](https://github.com/vector-im/element-android/issues/5762))
+
+Other changes
+-------------
+ - Upgrade konfetti lib from 1.3.2 to 2.0.2 ([#5079](https://github.com/vector-im/element-android/issues/5079))
+ - Spaces feedback section is removed from left panel ([#5486](https://github.com/vector-im/element-android/issues/5486))
+ - Reduce error logs ([#5703](https://github.com/vector-im/element-android/issues/5703))
+ - Adds a complete editor config file for our current code style ([#5727](https://github.com/vector-im/element-android/issues/5727))
+ - Updates the posthog dev environment url and api key ([#5732](https://github.com/vector-im/element-android/issues/5732))
+ - Setup Dokka to be able to generate documentation of the SDK module. Run `./gradlew matrix-sdk-android:dokkaHtml` to do it. ([#5744](https://github.com/vector-im/element-android/issues/5744))
+
+
 Changes in Element v1.4.11 (2022-04-07)
 =======================================
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 053931cac5..52ccf47e6a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -124,7 +124,9 @@ As a general rule, please never edit or add or remove translations to the projec
 
 #### Adding new string
 
-When adding new string resources, please only add new entries in file `value/strings.xml`. Translations will be added later by the community of translators using Weblate.
+When adding new string resources, please only add new entries in the file `value/strings.xml`. Translations will be added later by the community of translators using Weblate.
+
+The file `value/strings.xml` must only contain American English (U. S. English) values, as this is the default language of the Android operating system. So for instance, please use "color" instead of "colour". Element Android will still use the language set on the system by the user, like any other Android applications which provide translations. The system language can be any other English language variants, or any other languages. Note that this is also possible to override the system language using the Element Android in-app language settings.
 
 New strings can be added anywhere in the file `value/strings.xml`, not necessarily at the end of the file. Generally, it's even better to add the new strings in some dedicated section per feature, and not at the end of the file, to avoid merge conflict between 2 PR adding strings at the end of the same file.
 
diff --git a/README.md b/README.md
index 8306fd8593..54dfb7b288 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ It is a total rewrite of [Riot-Android](https://github.com/vector-im/riot-androi
 [<img src="resources/img/google-play-badge.png" alt="Get it on Google Play" height="60">](https://play.google.com/store/apps/details?id=im.vector.app)
 [<img src="resources/img/f-droid-badge.png" alt="Get it on F-Droid" height="60">](https://f-droid.org/app/im.vector.app)
 
-Nightly build: [![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop) Nighly test status: [![allScreensTest](https://github.com/vector-im/element-android/actions/workflows/nightly.yml/badge.svg)](https://github.com/vector-im/element-android/actions/workflows/nightly.yml)
+Nightly build: [![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop) Nightly test status: [![allScreensTest](https://github.com/vector-im/element-android/actions/workflows/nightly.yml/badge.svg)](https://github.com/vector-im/element-android/actions/workflows/nightly.yml)
 
 
 # New Android SDK
@@ -53,3 +53,4 @@ Come chat with the community in the dedicated Matrix [room](https://matrix.to/#/
 Issues are triaged by community members and the Android App Team, following the [triage process](https://github.com/vector-im/element-meta/wiki/Triage-process).
 
 We use [issue labels](https://github.com/vector-im/element-meta/wiki/Issue-labelling) to sort all incoming issues.
+
diff --git a/build.gradle b/build.gradle
index 6cbc11351e..b34efc8222 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,10 +5,17 @@ buildscript {
     apply from: 'dependencies_groups.gradle'
 
     repositories {
-        google()
+        // Do not use `google()`, it prevents Dependabot from working properly
+        maven {
+            url 'https://maven.google.com'
+        }
         maven {
             url "https://plugins.gradle.org/m2/"
         }
+        // Do not use `mavenCentral()`, it prevents Dependabot from working properly
+        maven {
+            url 'https://repo1.maven.org/maven2'
+        }
     }
 
     dependencies {
@@ -21,8 +28,8 @@ buildscript {
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.3'
         classpath 'com.google.android.gms:oss-licenses-plugin:0.10.5'
         classpath "com.likethesalad.android:stem-plugin:2.0.0"
-        classpath 'org.owasp:dependency-check-gradle:7.0.4.1'
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.6.20"
+        classpath 'org.owasp:dependency-check-gradle:7.1.0.1'
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.6.21"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -30,7 +37,7 @@ buildscript {
 
 // ktlint Plugin
 plugins {
-    id "org.jlleitschuh.gradle.ktlint" version "10.2.1"
+    id "org.jlleitschuh.gradle.ktlint" version "10.3.0"
     id 'com.autonomousapps.dependency-analysis' version "1.0.0"
 }
 
@@ -48,7 +55,9 @@ allprojects {
     apply plugin: "org.jlleitschuh.gradle.ktlint"
 
     repositories {
-        mavenCentral {
+        // Do not use `mavenCentral()`, it prevents Dependabot from working properly
+        maven {
+            url 'https://repo1.maven.org/maven2'
             content {
                 groups.mavenCentral.regex.each { includeGroupByRegex it }
                 groups.mavenCentral.group.each { includeGroup it }
@@ -71,14 +80,18 @@ allprojects {
                 groups.jitsi.group.each { includeGroup it }
             }
         }
-        google {
+        // Do not use `google()`, it prevents Dependabot from working properly
+        maven {
+            url 'https://maven.google.com'
             content {
                 groups.google.regex.each { includeGroupByRegex it }
                 groups.google.group.each { includeGroup it }
             }
         }
         //noinspection JcenterRepositoryObsolete
-        jcenter {
+        // Do not use `jcenter`, it prevents Dependabot from working properly
+        maven {
+            url 'https://jcenter.bintray.com'
             content {
                 groups.jcenter.regex.each { includeGroupByRegex it }
                 groups.jcenter.group.each { includeGroup it }
diff --git a/changelog.d/2396.wip b/changelog.d/2396.wip
deleted file mode 100644
index 9af8fa16c0..0000000000
--- a/changelog.d/2396.wip
+++ /dev/null
@@ -1 +0,0 @@
-Adds a new homeserver selection screen when creating an account
\ No newline at end of file
diff --git a/changelog.d/4305.bugfix b/changelog.d/4305.bugfix
deleted file mode 100644
index 95e4a966fc..0000000000
--- a/changelog.d/4305.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Added text next to spinner when loading information after user is clicked on space members screen
\ No newline at end of file
diff --git a/changelog.d/46312.misc b/changelog.d/46312.misc
new file mode 100644
index 0000000000..5e0112372f
--- /dev/null
+++ b/changelog.d/46312.misc
@@ -0,0 +1 @@
+Notify the user for each new message
diff --git a/changelog.d/5079.misc b/changelog.d/5079.misc
deleted file mode 100644
index c38bf043ea..0000000000
--- a/changelog.d/5079.misc
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade konfetti lib from 1.3.2 to 2.0.2
\ No newline at end of file
diff --git a/changelog.d/5151.misc b/changelog.d/5151.misc
new file mode 100644
index 0000000000..b785c4229c
--- /dev/null
+++ b/changelog.d/5151.misc
@@ -0,0 +1 @@
+Improve threads rendering in the main timeline
diff --git a/changelog.d/5262.bugfix b/changelog.d/5262.bugfix
deleted file mode 100644
index 389c1ed8fa..0000000000
--- a/changelog.d/5262.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-The string `ftue_auth_carousel_workplace_body` was declared not translatable by mistake
\ No newline at end of file
diff --git a/changelog.d/5279.wip b/changelog.d/5279.wip
deleted file mode 100644
index 0c08081cf9..0000000000
--- a/changelog.d/5279.wip
+++ /dev/null
@@ -1 +0,0 @@
-Updates the Captcha and T&Cs registration screens in the FTUE flow to match the updated UI style
\ No newline at end of file
diff --git a/changelog.d/5475.bugfix b/changelog.d/5475.bugfix
deleted file mode 100644
index 03364f6a73..0000000000
--- a/changelog.d/5475.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix some cases where the read marker line would not show up
diff --git a/changelog.d/5481.bugfix b/changelog.d/5481.bugfix
deleted file mode 100644
index 64891b503c..0000000000
--- a/changelog.d/5481.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix sometimes read marker not properly updating
diff --git a/changelog.d/5554.bugfix b/changelog.d/5554.bugfix
deleted file mode 100644
index ee69f0dbfe..0000000000
--- a/changelog.d/5554.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix sometimes endless loading timeline
diff --git a/changelog.d/5570.bugfix b/changelog.d/5570.bugfix
deleted file mode 100644
index c3743d252f..0000000000
--- a/changelog.d/5570.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Use member name instead of room name in DM creation item
\ No newline at end of file
diff --git a/changelog.d/5582.feature b/changelog.d/5582.feature
deleted file mode 100644
index e6e72c8e9d..0000000000
--- a/changelog.d/5582.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add a setting to be able to always appear offline
diff --git a/changelog.d/5586.feature b/changelog.d/5586.feature
deleted file mode 100644
index 17d7bfce86..0000000000
--- a/changelog.d/5586.feature
+++ /dev/null
@@ -1 +0,0 @@
-Adds the ability for audio attachments to be played in the timeline
diff --git a/changelog.d/5596.bugfix b/changelog.d/5596.bugfix
deleted file mode 100644
index f51794c352..0000000000
--- a/changelog.d/5596.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Align auto-reporting of decryption errors implementation with web client.
\ No newline at end of file
diff --git a/changelog.d/5609.bugfix b/changelog.d/5609.bugfix
deleted file mode 100644
index 001b4bf400..0000000000
--- a/changelog.d/5609.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Choosing "leave all rooms and spaces" while leaving Space won't cause leaving DMs in this Space anymore
\ No newline at end of file
diff --git a/changelog.d/5618.bugfix b/changelog.d/5618.bugfix
deleted file mode 100644
index 8a839a2b4e..0000000000
--- a/changelog.d/5618.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixes display name being changed when using /myroomnick
diff --git a/changelog.d/5639.sdk b/changelog.d/5639.sdk
deleted file mode 100644
index 66167273f9..0000000000
--- a/changelog.d/5639.sdk
+++ /dev/null
@@ -1 +0,0 @@
-Include original event in live decryption listeners and update sync status naming to InitialSyncProgressing for clarity.
\ No newline at end of file
diff --git a/changelog.d/5659.bugfix b/changelog.d/5659.bugfix
deleted file mode 100644
index eec39a7738..0000000000
--- a/changelog.d/5659.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix endless loading if the event from a permalink is not found
diff --git a/changelog.d/5697.feature b/changelog.d/5697.feature
deleted file mode 100644
index 47504084f4..0000000000
--- a/changelog.d/5697.feature
+++ /dev/null
@@ -1 +0,0 @@
-Live Location Sharing - Send location data
\ No newline at end of file
diff --git a/changelog.d/5703.misc b/changelog.d/5703.misc
deleted file mode 100644
index 05e5080410..0000000000
--- a/changelog.d/5703.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce error logs
\ No newline at end of file
diff --git a/changelog.d/5703.sdk b/changelog.d/5703.sdk
deleted file mode 100644
index ece1fec8e8..0000000000
--- a/changelog.d/5703.sdk
+++ /dev/null
@@ -1 +0,0 @@
-KeysBackupService.getCurrentVersion takes a new type `KeysBackupLastVersionResult` in the callback.
\ No newline at end of file
diff --git a/changelog.d/5707.bugfix b/changelog.d/5707.bugfix
deleted file mode 100644
index 66bd8f30b6..0000000000
--- a/changelog.d/5707.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Redacted events are no longer visible.
\ No newline at end of file
diff --git a/changelog.d/5710.feature b/changelog.d/5710.feature
deleted file mode 100644
index d9b043bc32..0000000000
--- a/changelog.d/5710.feature
+++ /dev/null
@@ -1 +0,0 @@
-Live Location Sharing - Show message on start of a live
\ No newline at end of file
diff --git a/changelog.d/5711.feature b/changelog.d/5711.feature
deleted file mode 100644
index 76c6b23b69..0000000000
--- a/changelog.d/5711.feature
+++ /dev/null
@@ -1 +0,0 @@
-Live Location Sharing - Attach location data to beacon info state event
\ No newline at end of file
diff --git a/changelog.d/5719.feature b/changelog.d/5719.feature
deleted file mode 100644
index 7561dfd82f..0000000000
--- a/changelog.d/5719.feature
+++ /dev/null
@@ -1 +0,0 @@
-Do not cancel the current incremental sync request and treatment when the app goes to background
\ No newline at end of file
diff --git a/changelog.d/5727.misc b/changelog.d/5727.misc
deleted file mode 100644
index fd90a08b17..0000000000
--- a/changelog.d/5727.misc
+++ /dev/null
@@ -1 +0,0 @@
-Adds a complete editor config file for our current code style
diff --git a/changelog.d/5731.bugfix b/changelog.d/5731.bugfix
deleted file mode 100644
index 5fb639b3ef..0000000000
--- a/changelog.d/5731.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Don't wrongly show non-space invites in the space panel.
diff --git a/changelog.d/5732.misc b/changelog.d/5732.misc
deleted file mode 100644
index 1b0f89e0c0..0000000000
--- a/changelog.d/5732.misc
+++ /dev/null
@@ -1 +0,0 @@
-Updates the posthog dev environment url and api key
\ No newline at end of file
diff --git a/changelog.d/5735.bugfix b/changelog.d/5735.bugfix
deleted file mode 100644
index 99012f9254..0000000000
--- a/changelog.d/5735.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixes the onboarding confetti rendering behind the content instead of in-front
\ No newline at end of file
diff --git a/changelog.d/5744.misc b/changelog.d/5744.misc
deleted file mode 100644
index 0953eccd95..0000000000
--- a/changelog.d/5744.misc
+++ /dev/null
@@ -1 +0,0 @@
-Setup Dokka to be able to generate documentation of the SDK module. Run `./gradlew matrix-sdk-android:dokkaHtml` to do it.
\ No newline at end of file
diff --git a/changelog.d/5744.sdk b/changelog.d/5744.sdk
deleted file mode 100644
index aced939e55..0000000000
--- a/changelog.d/5744.sdk
+++ /dev/null
@@ -1,3 +0,0 @@
-A lot of classes which were exposed to the clients and were located in the package `org.matrix.android.sdk.internal` have been moved to the package `org.matrix.android.sdk.api`.
-All the classes which are in the package `org.matrix.android.sdk.internal` should now be declared `internal`.
-Some unused code and classes have been removed.
\ No newline at end of file
diff --git a/changelog.d/5746.bugfix b/changelog.d/5746.bugfix
deleted file mode 100644
index 975a75f70a..0000000000
--- a/changelog.d/5746.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixes crash when navigating the app whilst processing new room keys
\ No newline at end of file
diff --git a/changelog.d/5749.wip b/changelog.d/5749.wip
deleted file mode 100644
index a933f55cf5..0000000000
--- a/changelog.d/5749.wip
+++ /dev/null
@@ -1 +0,0 @@
-Adds error handling within the new FTUE server selection screen
\ No newline at end of file
diff --git a/changelog.d/5757.bugfix b/changelog.d/5757.bugfix
deleted file mode 100644
index 089cc23b4c..0000000000
--- a/changelog.d/5757.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix sorting of uploads in encrypted rooms
\ No newline at end of file
diff --git a/changelog.d/5758.feature b/changelog.d/5758.feature
deleted file mode 100644
index 512b5c3868..0000000000
--- a/changelog.d/5758.feature
+++ /dev/null
@@ -1 +0,0 @@
-Live Location Sharing - Update beacon info state event when sharing is ended
\ No newline at end of file
diff --git a/changelog.d/5762.sdk b/changelog.d/5762.sdk
deleted file mode 100644
index 0bb89d4f2f..0000000000
--- a/changelog.d/5762.sdk
+++ /dev/null
@@ -1 +0,0 @@
-Some data classes are now immutable, using `val` instead of `var`
\ No newline at end of file
diff --git a/changelog.d/5765.bugfix b/changelog.d/5765.bugfix
deleted file mode 100644
index ccf8c1b2c2..0000000000
--- a/changelog.d/5765.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixing setting transfer title in call transfer.
diff --git a/changelog.d/5766.bugfix b/changelog.d/5766.bugfix
deleted file mode 100644
index d3290decab..0000000000
--- a/changelog.d/5766.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Changes destination after joining a space to Explore Space Rooms screen
diff --git a/changelog.d/5767.bugfix b/changelog.d/5767.bugfix
deleted file mode 100644
index 2a34fbf4b3..0000000000
--- a/changelog.d/5767.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Unignoring a user will perform an initial sync
\ No newline at end of file
diff --git a/changelog.d/5825.bugfix b/changelog.d/5825.bugfix
new file mode 100644
index 0000000000..77560027ba
--- /dev/null
+++ b/changelog.d/5825.bugfix
@@ -0,0 +1 @@
+Changed copy and list order in member profile screen.
\ No newline at end of file
diff --git a/changelog.d/5911.feature b/changelog.d/5911.feature
new file mode 100644
index 0000000000..368a3b4056
--- /dev/null
+++ b/changelog.d/5911.feature
@@ -0,0 +1 @@
+Screen sharing over WebRTC
diff --git a/changelog.d/5941.bugfix b/changelog.d/5941.bugfix
new file mode 100644
index 0000000000..0ea17668c6
--- /dev/null
+++ b/changelog.d/5941.bugfix
@@ -0,0 +1 @@
+If animations are disable on the System, chat effects and confetti will be disabled too
diff --git a/changelog.d/5953.misc b/changelog.d/5953.misc
new file mode 100644
index 0000000000..a3ad5dae93
--- /dev/null
+++ b/changelog.d/5953.misc
@@ -0,0 +1 @@
+Reformatted project code
diff --git a/changelog.d/5965.sdk b/changelog.d/5965.sdk
new file mode 100644
index 0000000000..5bb6c3aac4
--- /dev/null
+++ b/changelog.d/5965.sdk
@@ -0,0 +1 @@
+Including SSL/TLS error handing when doing WellKnown lookups without a custom HomeServerConnectionConfig
diff --git a/dependencies.gradle b/dependencies.gradle
index ec27184d5c..6d198e482b 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -7,26 +7,26 @@ ext.versions = [
         'targetCompat'      : JavaVersion.VERSION_11,
 ]
 
-def gradle = "7.0.4"
+def gradle = "7.2.0"
 // Ref: https://kotlinlang.org/releases.html
 def kotlin = "1.6.0"
 def kotlinCoroutines = "1.6.0"
-def dagger = "2.40.5"
+def dagger = "2.42"
 def retrofit = "2.9.0"
 def arrow = "0.8.2"
 def markwon = "4.6.2"
 def moshi = "1.13.0"
-def lifecycle = "2.4.0"
+def lifecycle = "2.4.1"
 def flowBinding = "1.2.0"
 def epoxy = "4.6.2"
-def mavericks = "2.5.0"
-def glide = "4.12.0"
+def mavericks = "2.6.1"
+def glide = "4.13.2"
 def bigImageViewer = "1.8.1"
-def jjwt = "0.11.2"
-def vanniktechEmoji = "0.8.0"
+def jjwt = "0.11.5"
+def vanniktechEmoji = "0.9.0"
 
 // Testing
-def mockk = "1.12.1"
+def mockk = "1.12.3"
 def espresso = "3.4.0"
 def androidxTest = "1.4.0"
 def androidxOrchestrator = "1.4.1"
@@ -46,12 +46,12 @@ ext.libs = [
         ],
         androidx    : [
                 'activity'                : "androidx.activity:activity:1.2.4",
-                'appCompat'               : "androidx.appcompat:appcompat:1.4.0",
+                'appCompat'               : "androidx.appcompat:appcompat:1.4.1",
                 'core'                    : "androidx.core:core-ktx:1.7.0",
                 'recyclerview'            : "androidx.recyclerview:recyclerview:1.2.1",
                 'exifinterface'           : "androidx.exifinterface:exifinterface:1.3.3",
-                'fragmentKtx'             : "androidx.fragment:fragment-ktx:1.4.0",
-                'constraintLayout'        : "androidx.constraintlayout:constraintlayout:2.1.2",
+                'fragmentKtx'             : "androidx.fragment:fragment-ktx:1.4.1",
+                'constraintLayout'        : "androidx.constraintlayout:constraintlayout:2.1.3",
                 'work'                    : "androidx.work:work-runtime-ktx:2.7.1",
                 'autoFill'                : "androidx.autofill:autofill:1.1.0",
                 'preferenceKtx'           : "androidx.preference:preference-ktx:1.1.1",
@@ -75,7 +75,7 @@ ext.libs = [
                 'transition'              : "androidx.transition:transition:1.2.0",
         ],
         google      : [
-                'material'                : "com.google.android.material:material:1.5.0"
+                'material'                : "com.google.android.material:material:1.6.0"
         ],
         dagger      : [
                 'dagger'                  : "com.google.dagger:dagger:$dagger",
diff --git a/dependencies_groups.gradle b/dependencies_groups.gradle
index 2c3f6a0219..8422e05930 100644
--- a/dependencies_groups.gradle
+++ b/dependencies_groups.gradle
@@ -164,6 +164,7 @@ ext.groups = [
                         'org.codehaus.woodstox',
                         'org.eclipse.ee4j',
                         'org.ec4j.core',
+                        'org.freemarker',
                         'org.glassfish.jaxb',
                         'org.hamcrest',
                         'org.jacoco',
diff --git a/docs/pull_request.md b/docs/pull_request.md
index b4dd0bd209..4775f292ee 100644
--- a/docs/pull_request.md
+++ b/docs/pull_request.md
@@ -32,14 +32,15 @@ Also, draft PR should not stay indefinitely in this state. It may be removed if
 
 ##### PR Review Assignment
 
-We use automatic assignment for PR reviews. A PR is automatically routed by GitHub to a team member using the round robin algorithm. The process is the following:
+We use automatic assignment for PR reviews. A PR is automatically routed by GitHub to 2 team members using the round robin algorithm. The process is the following:
 
-- The PR creator assigns the [element-android](https://github.com/orgs/vector-im/teams/element-android) team as a reviewer. They can skip this process and assign directly a specific member if they think they should take a look at it.
-- GitHub automatically assigns one reviewer. If the chosen reviewer is not available (holiday, etc.), remove them and set again the team, GitHub will select another reviewer.
-- The reviewer gets a notification to make the review: they review the code following the good practice (see the rest of this document).
+- The PR creator can assign specific people if they have another Android developer in their team or they think a specific reviewer should take a look at the PR.
+- If there are missing reviewers, the PR creator assigns the [element-android-reviewers](https://github.com/orgs/vector-im/teams/element-android-reviewers) team as a reviewer.
+- GitHub automatically assigns other reviewers. If one of the chosen reviewers is not available (holiday, etc.), remove them and set again the team, GitHub will select another reviewer.
+- Reviewers get a notification to make the review: they review the code following the good practice (see the rest of this document).
 - After making their own review, if they feel not confident enough, they can ask another person for a full review, or they can tag someone within a PR comment to check specific lines.
 
-For PRs coming from the community, the issue wrangler can assign either the team [element-android](https://github.com/orgs/vector-im/teams/element-android) or any member directly.
+For PRs coming from the community, the issue wrangler can assign either the team [element-android-reviewers](https://github.com/orgs/vector-im/teams/element-android-reviewers) or any members directly.
 
 ##### PR review time
 
diff --git a/docs/ui-tests.md b/docs/ui-tests.md
index 05eb50f525..667a6ed7fb 100644
--- a/docs/ui-tests.md
+++ b/docs/ui-tests.md
@@ -176,4 +176,4 @@ class SettingsAdvancedRobot {
         clickOn(R.string.settings_developer_mode_summary)
     }
 }
-```
\ No newline at end of file
+```
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40104060.txt b/fastlane/metadata/android/cs-CZ/changelogs/40104060.txt
new file mode 100644
index 0000000000..3eda022464
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104060.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Časová osa vláken je nyní živá a rychlejší. Opravy různých chyb a vylepšení stability.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases/tag/v1.4.6
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40104070.txt b/fastlane/metadata/android/cs-CZ/changelogs/40104070.txt
new file mode 100644
index 0000000000..cba2012c1c
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104070.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Opravy různých chyb a vylepšení stability.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases/tag/v1.4.7
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40104080.txt b/fastlane/metadata/android/cs-CZ/changelogs/40104080.txt
new file mode 100644
index 0000000000..61e7fd7940
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104080.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Časová osa vlákna je nyní živá a rychlejší. Opravy různých chyb a vylepšení stability.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40104100.txt b/fastlane/metadata/android/cs-CZ/changelogs/40104100.txt
new file mode 100644
index 0000000000..46a75b77a7
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104100.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Posun přehrávání v hlasových zprávách. Opravy různých chyb a vylepšení stability.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40104110.txt b/fastlane/metadata/android/cs-CZ/changelogs/40104110.txt
new file mode 100644
index 0000000000..578549ce6c
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104110.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Opravy různých chyb a vylepšení stability.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/40104120.txt b/fastlane/metadata/android/en-US/changelogs/40104120.txt
new file mode 100644
index 0000000000..ea188c101c
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40104120.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Allows users to appear offline and adds an audio player for audio attachments
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/40104130.txt b/fastlane/metadata/android/en-US/changelogs/40104130.txt
new file mode 100644
index 0000000000..ea188c101c
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40104130.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Allows users to appear offline and adds an audio player for audio attachments
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/40104140.txt b/fastlane/metadata/android/en-US/changelogs/40104140.txt
new file mode 100644
index 0000000000..5cbd25f4d3
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40104140.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Improve management of ignored users. Various bug fixes and stability improvements.
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/es-ES/changelogs/40103030.txt b/fastlane/metadata/android/es-ES/changelogs/40103030.txt
new file mode 100644
index 0000000000..36f59a2308
--- /dev/null
+++ b/fastlane/metadata/android/es-ES/changelogs/40103030.txt
@@ -0,0 +1,2 @@
+Cambios principales en esta versión: Hacer la política de servidores de indentidad visible en los ajusted. Temporalmente quitar soporte para Android Auto.
+Registro de cambios: https://github.com/vector-im/element-android/releases/tag/v1.3.3
diff --git a/fastlane/metadata/android/es-ES/changelogs/40104110.txt b/fastlane/metadata/android/es-ES/changelogs/40104110.txt
new file mode 100644
index 0000000000..281df19388
--- /dev/null
+++ b/fastlane/metadata/android/es-ES/changelogs/40104110.txt
@@ -0,0 +1,2 @@
+Cambios principales en esta versión: Varias correciones de bugs y mejoras en la estabilidad
+Registro de cambios: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/es-ES/full_description.txt b/fastlane/metadata/android/es-ES/full_description.txt
index fdba15e90e..0e484158d9 100644
--- a/fastlane/metadata/android/es-ES/full_description.txt
+++ b/fastlane/metadata/android/es-ES/full_description.txt
@@ -37,3 +37,6 @@ Mensajería, llamadas de voz y video, uso compartido de archivos, uso compartido
 
 <b>Continúa donde lo dejaste</b>
 Manténgase en contacto donde quiera que esté con el historial de mensajes totalmente sincronizado en todos sus dispositivos y en la web en https://app.element.io
+
+<b>Código abierto</b>
+Element Android es un proyecto de código abierto, alojado en GitHub. Porfavor, reporta bugs y problemas en esta dirección: https://github.com/vector-im/element-android
diff --git a/fastlane/metadata/android/et/changelogs/40104060.txt b/fastlane/metadata/android/et/changelogs/40104060.txt
new file mode 100644
index 0000000000..f506b617ed
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40104060.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: jutulõngad on nüüd kasutatavad ja toimivad kiiremini, lisaks pisiparandused ja stabiilsust parandavad kohendused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases/tag/v1.4.6
diff --git a/fastlane/metadata/android/et/changelogs/40104070.txt b/fastlane/metadata/android/et/changelogs/40104070.txt
new file mode 100644
index 0000000000..ea3582678d
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40104070.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: pisiparandused ja stabiilsust parandavad kohendused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases/tag/v1.4.7
diff --git a/fastlane/metadata/android/et/changelogs/40104080.txt b/fastlane/metadata/android/et/changelogs/40104080.txt
new file mode 100644
index 0000000000..a35fded9b6
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40104080.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: jutulõngad on nüüd kasutatavad ja toimivad kiiremini, lisaks pisiparandused ja stabiilsust parandavad kohendused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/et/changelogs/40104100.txt b/fastlane/metadata/android/et/changelogs/40104100.txt
new file mode 100644
index 0000000000..b164935ba4
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40104100.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: kerimine häälsõnumites ning erinevate vigade parandused ja stabiilsust edendavad kohendused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/et/changelogs/40104110.txt b/fastlane/metadata/android/et/changelogs/40104110.txt
new file mode 100644
index 0000000000..1df5ac4176
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40104110.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: erinevate vigade parandused ja stabiilsust edendavad kohendused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40104060.txt b/fastlane/metadata/android/fa/changelogs/40104060.txt
new file mode 100644
index 0000000000..5a1188b370
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40104060.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: خط زمانی رشته‌ها اکنون زنده و سریع‌تر است. چندین رفع اشکال و بهبود پایداری.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.4.6
diff --git a/fastlane/metadata/android/fa/changelogs/40104070.txt b/fastlane/metadata/android/fa/changelogs/40104070.txt
new file mode 100644
index 0000000000..d35ded337b
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40104070.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: چندین رفع اشکال و بهبود پایداری.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases/tag/v1.4.7
diff --git a/fastlane/metadata/android/fa/changelogs/40104080.txt b/fastlane/metadata/android/fa/changelogs/40104080.txt
new file mode 100644
index 0000000000..673a46a10d
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40104080.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: خط زمانی رشته‌ها اکنون زنده و سریع‌تر است. چندین رفع اشکال و بهبود پایداری.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40104100.txt b/fastlane/metadata/android/fa/changelogs/40104100.txt
new file mode 100644
index 0000000000..e7cdca6641
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40104100.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: لغزش در پیام‌های صوتی. رفع اشکال‌های مختلف و بهبودهای امنیتی.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40104110.txt b/fastlane/metadata/android/fa/changelogs/40104110.txt
new file mode 100644
index 0000000000..29efb95925
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40104110.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: رفع اشکال‌های مختلف و بهبودهای پایداری.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40104040.txt b/fastlane/metadata/android/fr-FR/changelogs/40104040.txt
new file mode 100644
index 0000000000..af2d7bb086
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104040.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Mise-à-jour de l’interface de notification de rédaction en cours. Plusieurs corrections de bogues et d’améliorations de stabilité.
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1.4.4
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40104060.txt b/fastlane/metadata/android/fr-FR/changelogs/40104060.txt
new file mode 100644
index 0000000000..24e0fde3f3
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104060.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Les fils de discussion sont officiellement disponibles, et plus rapides. Plusieurs corrections de bogues et d’améliorations de stabilité.
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1.4.6
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40104070.txt b/fastlane/metadata/android/fr-FR/changelogs/40104070.txt
new file mode 100644
index 0000000000..3f9879d917
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104070.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Plusieurs corrections de bogues et d’améliorations de stabilité.
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1.4.7
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40104080.txt b/fastlane/metadata/android/fr-FR/changelogs/40104080.txt
new file mode 100644
index 0000000000..84f92c18e2
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104080.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Les fils de discussion sont officiellement disponibles, et plus rapides. Plusieurs corrections de bogues et d’améliorations de stabilité.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104040.txt b/fastlane/metadata/android/hu-HU/changelogs/40104040.txt
new file mode 100644
index 0000000000..60ec5256aa
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104040.txt
@@ -0,0 +1,2 @@
+Fő változás ebben a verzióban: Gépelés visszajelzési frissítések a felületen. További hibajavítások egy stabilitást növelő fejlesztések.
+Teljes változásnapló: https://github.com/vector-im/element-android/releases/tag/v1.4.4
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104060.txt b/fastlane/metadata/android/hu-HU/changelogs/40104060.txt
new file mode 100644
index 0000000000..a3f4b89d92
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104060.txt
@@ -0,0 +1,2 @@
+Fő változás ebben a verzióban: Megjelentek az üzenetszálak az idővonalon és gyorsak. További hibajavítások és stabilitási fejlesztések.
+Teljes változásnapló: https://github.com/vector-im/element-android/releases/tag/v1.4.6
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104070.txt b/fastlane/metadata/android/hu-HU/changelogs/40104070.txt
new file mode 100644
index 0000000000..0f969fb577
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104070.txt
@@ -0,0 +1,2 @@
+Fő változás ebben a verzióban: Hibajavítások és stabilizációs fejlesztések.
+Teljes változásnapló: https://github.com/vector-im/element-android/releases/tag/v1.4.7
diff --git a/fastlane/metadata/android/hu-HU/changelogs/40104080.txt b/fastlane/metadata/android/hu-HU/changelogs/40104080.txt
new file mode 100644
index 0000000000..c29b20c216
--- /dev/null
+++ b/fastlane/metadata/android/hu-HU/changelogs/40104080.txt
@@ -0,0 +1,2 @@
+Fő változás ebben a verzióban: Megjelentek az üzenetszálak az idővonalon és gyorsak. További hibajavítások és stabilitási fejlesztések.
+Teljes változásnapló: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40104060.txt b/fastlane/metadata/android/id/changelogs/40104060.txt
new file mode 100644
index 0000000000..3b4ce82497
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40104060.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Linimasa utasan sekarang langsung dan lebih cepat. Banyak perbaikan kutu dan perbaikan stabilitas.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.4.6
diff --git a/fastlane/metadata/android/id/changelogs/40104070.txt b/fastlane/metadata/android/id/changelogs/40104070.txt
new file mode 100644
index 0000000000..39daf31eb6
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40104070.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Banyak perbaikan kutu dan perbaikan stabilitas.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases/tag/v1.4.7
diff --git a/fastlane/metadata/android/id/changelogs/40104080.txt b/fastlane/metadata/android/id/changelogs/40104080.txt
new file mode 100644
index 0000000000..0a5ae82096
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40104080.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Linimasa utasan sekarang langsung dan lebih cepat. Banyak perbaikan kutu dan perbaikan stabilitas.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40104100.txt b/fastlane/metadata/android/id/changelogs/40104100.txt
new file mode 100644
index 0000000000..3cda40aecc
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40104100.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Gulir di pesan suara. Banyak perbaikan kutu dan perbaikan stabilitas.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40104110.txt b/fastlane/metadata/android/id/changelogs/40104110.txt
new file mode 100644
index 0000000000..1017951d47
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40104110.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Banyak perbaikan kutu dan perbaikan stabilitas.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/it-IT/changelogs/40104060.txt b/fastlane/metadata/android/it-IT/changelogs/40104060.txt
new file mode 100644
index 0000000000..c9ea8af2cc
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40104060.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: la linea temporale per argomenti è ora attiva e più veloce. Varie correzioni e miglioramenti.
+Cronologia completa: https://github.com/vector-im/element-android/releases/tag/v1.4.6
diff --git a/fastlane/metadata/android/it-IT/changelogs/40104070.txt b/fastlane/metadata/android/it-IT/changelogs/40104070.txt
new file mode 100644
index 0000000000..2dfd415920
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40104070.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: varie correzioni di errori e miglioramenti della stabilità.
+Cronologia completa: https://github.com/vector-im/element-android/releases/tag/v1.4.7
diff --git a/fastlane/metadata/android/it-IT/changelogs/40104080.txt b/fastlane/metadata/android/it-IT/changelogs/40104080.txt
new file mode 100644
index 0000000000..8427e3d3fe
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40104080.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: la linea temporale per argomenti è ora attiva e più veloce. Varie correzioni e miglioramenti.
+Cronologia completa: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/it-IT/changelogs/40104100.txt b/fastlane/metadata/android/it-IT/changelogs/40104100.txt
new file mode 100644
index 0000000000..6376e6c45a
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40104100.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: scorrimento nei vocali. Varie correzioni e miglioramenti della stabilità.
+Cronologia completa: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/it-IT/changelogs/40104110.txt b/fastlane/metadata/android/it-IT/changelogs/40104110.txt
new file mode 100644
index 0000000000..556a6fc7ea
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40104110.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: varie correzioni di errori e miglioramenti della stabilità.
+Cronologia completa: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/lo/changelogs/40100100.txt b/fastlane/metadata/android/lo/changelogs/40100100.txt
new file mode 100644
index 0000000000..fe0ee08327
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40100100.txt
@@ -0,0 +1,2 @@
+ສະບັບໃຫມ່ນີ້ສ່ວນໃຫຍ່ແມ່ນມີການແກ້ໄຂແລະການປັບປຸງ bug. ຕອນນີ້ການສົ່ງຂໍ້ຄວາມແມ່ນໄວຂຶ້ນຫຼາຍ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.0.10
diff --git a/fastlane/metadata/android/lo/changelogs/40100110.txt b/fastlane/metadata/android/lo/changelogs/40100110.txt
new file mode 100644
index 0000000000..69139783ad
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40100110.txt
@@ -0,0 +1,2 @@
+ຮຸ່ນໃຫມ່ນີ້ສ່ວນໃຫຍ່ແມ່ນປະກອບດ້ວຍໜ້າຕາແອັບແລະການປັບປຸງປະສົບການຂອງຜູ້ໃຊ້. ດຽວນີ້ທ່ານສາມາດເຊີນໝູ່, ແລະສ້າງການສົນທະນາກົງໄດ້ໄວຂຶ້ນໂດຍການສະແກນລະຫັດ QR.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.0.11
diff --git a/fastlane/metadata/android/lo/changelogs/40100120.txt b/fastlane/metadata/android/lo/changelogs/40100120.txt
new file mode 100644
index 0000000000..256cd1a437
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40100120.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ຕົວຢ່າງ URL, ແປ້ນພິມ Emoji ໃໝ່, ຄວາມສາມາດໃນການຕັ້ງຄ່າຫ້ອງໃໝ່, ແລະຫິມະສຳລັບວັນຄຣິດສະມາດ!
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.0.12
diff --git a/fastlane/metadata/android/lo/changelogs/40100130.txt b/fastlane/metadata/android/lo/changelogs/40100130.txt
new file mode 100644
index 0000000000..c4878ea5f6
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40100130.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ຕົວຢ່າງ URL, ແປ້ນພິມ Emoji ໃໝ່, ຄວາມສາມາດໃນການຕັ້ງຄ່າຫ້ອງໃໝ່, ແລະຫິມະສຳລັບວັນຄຣິດສະມາດ!
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.0.13
diff --git a/fastlane/metadata/android/lo/changelogs/40100140.txt b/fastlane/metadata/android/lo/changelogs/40100140.txt
new file mode 100644
index 0000000000..591b9b94b3
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40100140.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ແກ້ໄຂການອະນຸຍາດຫ້ອງ, ຮູບແບບ ແຈ້ງ / ມືດອັດຕະໂນມັດ, ແລະການແກ້ໄຂບັນຫາຈຳນວນໜຶ່ງ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.0.14
diff --git a/fastlane/metadata/android/lo/changelogs/40100150.txt b/fastlane/metadata/android/lo/changelogs/40100150.txt
new file mode 100644
index 0000000000..98577742c7
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40100150.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ຮັບຮອງການເຂົ້າລະບົບດ້ວຍສື່ສັງຄົມອອນລາຍ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.0.15
diff --git a/fastlane/metadata/android/lo/changelogs/40100160.txt b/fastlane/metadata/android/lo/changelogs/40100160.txt
new file mode 100644
index 0000000000..c369fc88d3
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40100160.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ຮັບຮອງການເຂົ້າລະບົບດ້ວຍສື່ສັງຄົມອອນລາຍ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.0.15 and https://github.com/vector-im/element-android/releases/tag/v1.0.16
diff --git a/fastlane/metadata/android/lo/changelogs/40100170.txt b/fastlane/metadata/android/lo/changelogs/40100170.txt
new file mode 100644
index 0000000000..776e1b6082
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40100170.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ແກ້ໄຂຂໍ້ຜິດພາດ!
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.0.17
diff --git a/fastlane/metadata/android/lo/changelogs/40101000.txt b/fastlane/metadata/android/lo/changelogs/40101000.txt
new file mode 100644
index 0000000000..f7d621404a
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40101000.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ປັບປຸງປະສິດທິພາບຂອງ VoIP (ໂທສຽງ ແລະໂທວີດີໂອໃນການສົນທະນາກົງ) ແລະແກ້ໄຂຂໍ້ຜິດພາດ!
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.1.0
diff --git a/fastlane/metadata/android/lo/changelogs/40101010.txt b/fastlane/metadata/android/lo/changelogs/40101010.txt
new file mode 100644
index 0000000000..e2e1778b7a
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40101010.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ປັບປຸງປະສິດທິພາບ ແລະແກ້ໄຂຂໍ້ຜິດພາດ!
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.1.1
diff --git a/fastlane/metadata/android/lo/changelogs/40101020.txt b/fastlane/metadata/android/lo/changelogs/40101020.txt
new file mode 100644
index 0000000000..581db95e90
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40101020.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ປັບປຸງປະສິດທິພາບ ແລະແກ້ໄຂຂໍ້ຜິດພາດ!
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.1.2
diff --git a/fastlane/metadata/android/lo/changelogs/40101030.txt b/fastlane/metadata/android/lo/changelogs/40101030.txt
new file mode 100644
index 0000000000..46d861995f
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40101030.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ປັບປຸງປະສິດທິພາບ ແລະແກ້ໄຂຂໍ້ຜິດພາດ!
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.1.3
diff --git a/fastlane/metadata/android/lo/changelogs/40101040.txt b/fastlane/metadata/android/lo/changelogs/40101040.txt
new file mode 100644
index 0000000000..8ea7cac4f4
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40101040.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ປັບປຸງປະສິດທິພາບ ແລະແກ້ໄຂຂໍ້ຜິດພາດ!
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.1.4
diff --git a/fastlane/metadata/android/lo/changelogs/40101050.txt b/fastlane/metadata/android/lo/changelogs/40101050.txt
new file mode 100644
index 0000000000..2823c04b06
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40101050.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ການແກ້ບັນຫາດ່ວນສໍາລັບ 1.1.4
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.1.5
diff --git a/fastlane/metadata/android/lo/changelogs/40101060.txt b/fastlane/metadata/android/lo/changelogs/40101060.txt
new file mode 100644
index 0000000000..0cdea9e2c7
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40101060.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ການແກ້ບັນຫາດ່ວນສໍາລັບ 1.1.5
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.1.6
diff --git a/fastlane/metadata/android/lo/changelogs/40101070.txt b/fastlane/metadata/android/lo/changelogs/40101070.txt
new file mode 100644
index 0000000000..08926229f9
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40101070.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ຮອງຮັບເບຕ້າສຳລັບ Spaces. ບີບອັດວິດີໂອກ່ອນທີ່ຈະສົ່ງ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.1.7
diff --git a/fastlane/metadata/android/lo/changelogs/40101080.txt b/fastlane/metadata/android/lo/changelogs/40101080.txt
new file mode 100644
index 0000000000..f2947aae63
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40101080.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ການປັບປຸງສໍາລັບ Spaces.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.1.8
diff --git a/fastlane/metadata/android/lo/changelogs/40101090.txt b/fastlane/metadata/android/lo/changelogs/40101090.txt
new file mode 100644
index 0000000000..129f86c562
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40101090.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ເພີ່ມການຮັບຮອງສໍາລັບເຄືອຂ່າຍ gitter.im.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.1.9
diff --git a/fastlane/metadata/android/lo/changelogs/40101100.txt b/fastlane/metadata/android/lo/changelogs/40101100.txt
new file mode 100644
index 0000000000..337137d3bc
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40101100.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ອັບເດດຮູບແບບສີສັນ ແລະຮູບແບບສີສັນ ແລະຄຸນສົມບັດໃໝ່ສຳລັບຊ່ອງຫວ່າງ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.1.10
diff --git a/fastlane/metadata/android/lo/changelogs/40101110.txt b/fastlane/metadata/android/lo/changelogs/40101110.txt
new file mode 100644
index 0000000000..f95972eaa9
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40101110.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ອັບເດດຮູບແບບສີສັນ ແລະຮູບແບບສີສັນ ແລະຄຸນສົມບັດໃໝ່ສຳລັບຊ່ອງຫວ່າງ (bugfix ສຳລັບ 1.1.10)
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.1.11
diff --git a/fastlane/metadata/android/lo/changelogs/40101120.txt b/fastlane/metadata/android/lo/changelogs/40101120.txt
new file mode 100644
index 0000000000..a613e176aa
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40101120.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ອັບເດດຮູບແບບສີສັນ ແລະຮູບແບບ ແລະແກ້ໄຂການຂັດຂ້ອງຫຼັງຈາກການໂທວິດີໂອ
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.1.12
diff --git a/fastlane/metadata/android/lo/changelogs/40101130.txt b/fastlane/metadata/android/lo/changelogs/40101130.txt
new file mode 100644
index 0000000000..3cc85bc6f8
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40101130.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ແກ້ໄຂບັນຫາກ່ຽວຄວາມສະຖຽນ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.1.13
diff --git a/fastlane/metadata/android/lo/changelogs/40101140.txt b/fastlane/metadata/android/lo/changelogs/40101140.txt
new file mode 100644
index 0000000000..11a5df1059
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40101140.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ແກ້ໄຂບັນຫາກ່ຽວກັບຂໍ້ຄວາມທີ່ຖືກເຂົ້າລະຫັດ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.1.14
diff --git a/fastlane/metadata/android/lo/changelogs/40101150.txt b/fastlane/metadata/android/lo/changelogs/40101150.txt
new file mode 100644
index 0000000000..8751496a49
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40101150.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ການປະຕິບັດຂໍ້ຄວາມສຽງພາຍໃຕ້ການຕັ້ງຄ່າຫ້ອງທົດລອງ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.1.15
diff --git a/fastlane/metadata/android/lo/changelogs/40101160.txt b/fastlane/metadata/android/lo/changelogs/40101160.txt
new file mode 100644
index 0000000000..c102140102
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40101160.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ແກ້ໄຂຂໍ້ຜິດພາດໃນເວລາສົ່ງຂໍ້ຄວາມເຂົ້າລະຫັດຖ້າມີຄົນຢູ່ໃນຫ້ອງອອກຈາກລະບົບ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.1.16
diff --git a/fastlane/metadata/android/lo/changelogs/40102000.txt b/fastlane/metadata/android/lo/changelogs/40102000.txt
new file mode 100644
index 0000000000..69f1667b93
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40102000.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ການສົນທະນາດ້ວຍສຽງເປີດໄວ້ໂດຍມາດຕະຖານ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.2.0
diff --git a/fastlane/metadata/android/lo/changelogs/40102010.txt b/fastlane/metadata/android/lo/changelogs/40102010.txt
new file mode 100644
index 0000000000..237b48ba3b
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40102010.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ການປັບປຸງຫຼາຍຢ່າງກ່ຽວກັບ VoIP ແລະ Spaces (ຍັງຢູ່ໃນເບຕ້າ).
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.2.1
diff --git a/fastlane/metadata/android/lo/changelogs/40103000.txt b/fastlane/metadata/android/lo/changelogs/40103000.txt
new file mode 100644
index 0000000000..8e386df4a7
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40103000.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ຈັດລະບຽບຫ້ອງຂອງທ່ານໂດຍໃຊ້ Spaces!
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.3.0
diff --git a/fastlane/metadata/android/lo/changelogs/40103010.txt b/fastlane/metadata/android/lo/changelogs/40103010.txt
new file mode 100644
index 0000000000..0a6a6461fd
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40103010.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ຈັດລະບຽບຫ້ອງຂອງທ່ານໂດຍໃຊ້ Spaces! v1.3.1 ກຳລັງແກ້ໄຂບັນແອັບໃຊ້ບໍ່ໄດ້ທີ່ສາມາດເກີດຂຶ້ນໃນ v1.3.0.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.3.1
diff --git a/fastlane/metadata/android/lo/changelogs/40103020.txt b/fastlane/metadata/android/lo/changelogs/40103020.txt
new file mode 100644
index 0000000000..8b9ed12a3a
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40103020.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ເພີ່ມການຮອງຮັບ Android Auto. ການແກ້ໄຂຍັກຫຼາຍອັນ!
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.3.2
diff --git a/fastlane/metadata/android/lo/changelogs/40103030.txt b/fastlane/metadata/android/lo/changelogs/40103030.txt
new file mode 100644
index 0000000000..6374f4fdf5
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40103030.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ເຮັດໃຫ້ນະໂຍບາຍຂອງເຄື່ອງແມ່ຂ່າຍຢັ້ງຢືນຕົວຕົນ (ຫຼາຍໜ່ວຍ) ໃຫ້ເຫັນຢູ່ໃນການຕັ້ງຄ່າ. ລຶບການຮອງຮັບ Android Auto ອອກຊົ່ວຄາວ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.3.3
diff --git a/fastlane/metadata/android/lo/changelogs/40103040.txt b/fastlane/metadata/android/lo/changelogs/40103040.txt
new file mode 100644
index 0000000000..896d9190ce
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40103040.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ເພີ່ມການຮອງຮັບການມີຢູ່, ສໍາລັບຫ້ອງຂໍ້ຄວາມໂດຍກົງ (ໝາຍເຫດ: ການມີຢູ່ຖືກປິດການໃຊ້ງານຢູ່ໃນ matrix.org). ເພີ່ມການຮອງຮັບ Android Auto ອີກຄັ້ງ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.3.4
diff --git a/fastlane/metadata/android/lo/changelogs/40103050.txt b/fastlane/metadata/android/lo/changelogs/40103050.txt
new file mode 100644
index 0000000000..b76db1a80c
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40103050.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ເພີ່ມການຮອງຮັບການມີຢູ່, ສໍາລັບຫ້ອງຂໍ້ຄວາມໂດຍກົງ (ໝາຍເຫດ: ການມີຢູ່ຖືກປິດການໃຊ້ງານຢູ່ໃນ matrix.org). ເພີ່ມການຮອງຮັບ Android Auto ອີກຄັ້ງ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.3.5
diff --git a/fastlane/metadata/android/lo/changelogs/40103060.txt b/fastlane/metadata/android/lo/changelogs/40103060.txt
new file mode 100644
index 0000000000..2e97183a56
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40103060.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ເພີ່ມການຮອງຮັບການມີຢູ່, ສໍາລັບຫ້ອງຂໍ້ຄວາມໂດຍກົງ (ໝາຍເຫດ: ການມີຢູ່ຖືກປິດການໃຊ້ງານຢູ່ໃນ matrix.org). ເພີ່ມການຮອງຮັບ Android Auto ອີກຄັ້ງ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.3.6
diff --git a/fastlane/metadata/android/lo/changelogs/40103070.txt b/fastlane/metadata/android/lo/changelogs/40103070.txt
new file mode 100644
index 0000000000..47eb6c7b4d
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40103070.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ແກ້ໄຂບັກສ່ວນໃຫຍ່ກ່ຽວກັບການແຈ້ງເຕືອນ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.3.7-RC2
diff --git a/fastlane/metadata/android/lo/changelogs/40103080.txt b/fastlane/metadata/android/lo/changelogs/40103080.txt
new file mode 100644
index 0000000000..a12d374d20
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40103080.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ແກ້ໄຂບັກ!
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.3.8
diff --git a/fastlane/metadata/android/lo/changelogs/40103090.txt b/fastlane/metadata/android/lo/changelogs/40103090.txt
new file mode 100644
index 0000000000..ee93ca0a96
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40103090.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ເພີ່ມການຮອງຮັບສະບັບຮ່າງການສົນທະນາດ້ວຍສຽງ. ແກ້ໄຂບັກຫຼາຍໆອັນ!
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.3.09
diff --git a/fastlane/metadata/android/lo/changelogs/40103100.txt b/fastlane/metadata/android/lo/changelogs/40103100.txt
new file mode 100644
index 0000000000..b8b65387ef
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40103100.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ເພີ່ມການຮອງຮັບແບບສໍາຫຼວດ (ໃນຫ້ອງທົດລອງ). ການອອກແບບຕົວຢ່າງ URL ໃໝ່.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.3.10
diff --git a/fastlane/metadata/android/lo/changelogs/40103110.txt b/fastlane/metadata/android/lo/changelogs/40103110.txt
new file mode 100644
index 0000000000..f64ee3b469
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40103110.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ແກ້ໄຂບັກ!
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.3.11
diff --git a/fastlane/metadata/android/lo/changelogs/40103120.txt b/fastlane/metadata/android/lo/changelogs/40103120.txt
new file mode 100644
index 0000000000..a7b8412cfb
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40103120.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ແກ້ໄຂບັກ!.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.3.12
diff --git a/fastlane/metadata/android/lo/changelogs/40103130.txt b/fastlane/metadata/android/lo/changelogs/40103130.txt
new file mode 100644
index 0000000000..cb725ee68c
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40103130.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ການປ່ຽນແປງຄັ້ງທໍາອິດໃນຫນ້າຈໍເລີ່ມຕົ້ນ, ລວມທັງການວິເຄາະເລືອກເຂົ້າຮ່ວມ. ຮອງຮັບເຫດການທີ່ມີຄະນິດສາດເພີ່ມຢູ່ໃນຫ້ອງທົດລອງ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.3.13
diff --git a/fastlane/metadata/android/lo/changelogs/40103140.txt b/fastlane/metadata/android/lo/changelogs/40103140.txt
new file mode 100644
index 0000000000..1f72757cf1
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40103140.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ການປ່ຽນແປງຄັ້ງທໍາອິດໃນຫນ້າຈໍເລີ່ມຕົ້ນ, ລວມທັງການວິເຄາະເລືອກເຂົ້າຮ່ວມ. ຮອງຮັບເຫດການທີ່ມີຄະນິດສາດເພີ່ມຢູ່ໃນຫ້ອງທົດລອງ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.3.14
diff --git a/fastlane/metadata/android/lo/changelogs/40103150.txt b/fastlane/metadata/android/lo/changelogs/40103150.txt
new file mode 100644
index 0000000000..c11acd15d6
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40103150.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ການປ່ຽນແປງຄັ້ງທໍາອິດໃນຫນ້າຈໍເລີ່ມຕົ້ນ, ລວມທັງການວິເຄາະເລືອກເຂົ້າຮ່ວມ. ຮອງຮັບເຫດການທີ່ມີຄະນິດສາດເພີ່ມຢູ່ໃນຫ້ອງທົດລອງ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.3.15
diff --git a/fastlane/metadata/android/lo/changelogs/40103160.txt b/fastlane/metadata/android/lo/changelogs/40103160.txt
new file mode 100644
index 0000000000..a17f218463
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40103160.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ສົ່ງສະຖານທີ່ຂອງທ່ານໄປຫາຫ້ອງໃດກໍໄດ້. ແກ້ໄຂແບບສຳຫຼວດ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.3.16
diff --git a/fastlane/metadata/android/lo/changelogs/40103170.txt b/fastlane/metadata/android/lo/changelogs/40103170.txt
new file mode 100644
index 0000000000..b8337a19cc
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40103170.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ສົ່ງສະຖານທີ່ຂອງທ່ານໄປຫາຫ້ອງໃດກໍໄດ້. ແກ້ໄຂແບບສຳຫຼວດ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.3.17
diff --git a/fastlane/metadata/android/lo/changelogs/40103180.txt b/fastlane/metadata/android/lo/changelogs/40103180.txt
new file mode 100644
index 0000000000..e6b65ff812
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40103180.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ສົ່ງສະຖານທີ່ຂອງທ່ານໄປຫາຫ້ອງໃດກໍໄດ້. ແກ້ໄຂແບບສຳຫຼວດ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.3.18
diff --git a/fastlane/metadata/android/lo/changelogs/40104000.txt b/fastlane/metadata/android/lo/changelogs/40104000.txt
new file mode 100644
index 0000000000..9d849da5b7
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40104000.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ການປະຕິບັດເບື້ອງຕົ້ນຂອງຂໍ້ຄວາມແບບກະທູ້. ຂໍ້ຄວາມຮູບແບບປຸມເປົ້າ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.4.0
diff --git a/fastlane/metadata/android/lo/changelogs/40104020.txt b/fastlane/metadata/android/lo/changelogs/40104020.txt
new file mode 100644
index 0000000000..358ca7fd39
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40104020.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ເພີ່ມການສະຫນັບສະຫນູນກັບ @room ແລະແບບສໍາຫຼວດທີ່ບໍ່ເປີດເຜີຍໃນບັນດາການປ່ຽນແປງເລັກນ້ອຍອື່ນໆ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.4.2
diff --git a/fastlane/metadata/android/lo/changelogs/40104040.txt b/fastlane/metadata/android/lo/changelogs/40104040.txt
new file mode 100644
index 0000000000..7bfaf76bf2
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40104040.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ຕົວສະແດງການພິມ ແລະປັບປັງ IU. ແກ້ໄຂບັກຫຼາຍບ່ອນ ແລະ ປັບປຸງຄວາມສະຖຽນ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.4.4
diff --git a/fastlane/metadata/android/lo/changelogs/40104060.txt b/fastlane/metadata/android/lo/changelogs/40104060.txt
new file mode 100644
index 0000000000..10ae599698
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40104060.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ທາມລາຍກະທູ້ ປະຈຸບັນເປັນແບບຖ່າຍທອດສົດ ແລະໄວຂຶ້ນ. ແກ້ໄຂບັກຫຼາຍບ່ອນ ແລະ ປັບປຸງຄວາມສະຖຽນ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.4.6
diff --git a/fastlane/metadata/android/lo/changelogs/40104070.txt b/fastlane/metadata/android/lo/changelogs/40104070.txt
new file mode 100644
index 0000000000..4ede801350
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40104070.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ແກ້ໄຂບັກຫຼາຍບ່ອນ ແລະ ປັບປຸງຄວາມສະຖຽນ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases/tag/v1.4.7
diff --git a/fastlane/metadata/android/lo/changelogs/40104080.txt b/fastlane/metadata/android/lo/changelogs/40104080.txt
new file mode 100644
index 0000000000..5d7de22065
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40104080.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ເລື່ອນໃນຂໍ້ຄວາມສຽງ. ແກ້ໄຂບັກຫຼາຍບ່ອນ ແລະ ປັບປຸງຄວາມສະຖຽນ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/lo/changelogs/40104100.txt b/fastlane/metadata/android/lo/changelogs/40104100.txt
new file mode 100644
index 0000000000..5d7de22065
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40104100.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ເລື່ອນໃນຂໍ້ຄວາມສຽງ. ແກ້ໄຂບັກຫຼາຍບ່ອນ ແລະ ປັບປຸງຄວາມສະຖຽນ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/lo/changelogs/40104110.txt b/fastlane/metadata/android/lo/changelogs/40104110.txt
new file mode 100644
index 0000000000..edc025cb39
--- /dev/null
+++ b/fastlane/metadata/android/lo/changelogs/40104110.txt
@@ -0,0 +1,2 @@
+ການປ່ຽນແປງຫຼັກໃນສະບັບນີ້: ການແກ້ໄຂ bug ຕ່າງໆແລະການປັບປຸງຄວາມສະຖຽນ.
+ບັນທຶກການປ່ຽນແປງສະບັບເຕັມ: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/lo/full_description.txt b/fastlane/metadata/android/lo/full_description.txt
new file mode 100644
index 0000000000..094c1b57f5
--- /dev/null
+++ b/fastlane/metadata/android/lo/full_description.txt
@@ -0,0 +1,42 @@
+ລະບົບແຊັດນີ້ ມີຄວາມປອດໄພ ແລະເປັນແອັບທີ່ເຮັດຊ່ວຍສົ່ງເສີ່ມການເຮັດວຽກຮ່ວມກັນຢ່າງມີປະສິດທິຜົນໝາະສົມສຳລັບການສົນທະນາກຸ່ມໃນຂະນະທີ່ເຮັດວຽກທາງໄກ. ແອັບສົນທະນານີ້ໃຊ້ການເຂົ້າລະຫັດແບບຕົ້ນທາງຈົນຈົບເພື່ອໃຫ້ການປະຊຸມວິດີໂອທີ່ມີປະສິດທິພາບ, ການແບ່ງປັນໄຟລ໌ ແລະການໂທແບບສຽງ.
+
+<b>ຄຸນສົມບັດຂອງລະບົບລວມມີ:</b>
+- ເຄື່ອງມືການສື່ສານອອນໄລນ໌ແບບລຳ້ໜ້າ
+- ຂໍ້ຄວາມມີການເຂົ້າລະຫັດຢ່າງເຕັມສ່ວນເພື່ອໃຫ້ການສື່ສານຂອງອົງກອນມີຄວາມປອດໄພ, ເຖິງແມ່ນວ່າຈະເຮັດວຽກຈາກທາງໄກ
+- ລະບົບແຊັດແບບແບ່ງກະຈາຍການຄຸ້ມຄອງໂດຍນຳໃຊ້ນະວັດຕະກຳເປີດຂອງລະບົບ Matrix 
+- ການແບ່ງປັນໄຟລ໌ຢ່າງປອດໄພກັບຂໍ້ມູນທີ່ເຂົ້າລະຫັດໄວ້ໃນຂະນະທີ່ຈັດການໂຄງການ
+- ວິດີໂອສົນທະນາກັບ Voice over IP ແລະການແບ່ງປັນຫນ້າຈໍ
+- ການເຊື່ອມໂຍງງ່າຍດາຍກັບເຄື່ອງມືການຮ່ວມມືອອນໄລນ໌ຂອງທ່ານ, ເຄື່ອງມືການຄຸ້ມຄອງໂຄງການ, ການບໍລິການ VoIP ແລະຂໍ້ຄວາມອື່ນໆຂອງທີມ
+
+ລະບົບນີ້ແມ່ນແຕກຕ່າງກັນຢ່າງສິ້ນເຊີງຈາກແອັບຯສົ່ງຂໍ້ຄວາມ ແລະແອັບສົ່ງເສີມການຮ່ວມມືອື່ນໆ. ມັນດໍາເນີນການຢູ່ໃນ Matrix, ເຄືອຂ່າຍເປີດສໍາລັບການສົ່ງຂໍ້ຄວາມທີ່ປອດໄພແລະການສື່ສານແບບກະຈາຍການຄຸ້ມຄອງ. ທ່ານສາມາດຕັ້ງສະຖານີດ້ວຍຕົນເອງເພື່ອໃຫ້ຜູ້ໃຊ້ເປັນເຈົ້າຂອງສູງສຸດແລະຄຸ້ມຄອງຂໍ້ມູນແລະຂໍ້ຄວາມຂອງຕົນເອງ.
+
+<b>ຄວາມເປັນສ່ວນຕົວ ແລະຂໍ້ຄວາມເຂົ້າລະຫັດ</b>
+ລະບົບຈະປົກປ້ອງທ່ານຈາກການໂຄສະນາທີ່ບໍ່ຕ້ອງການ, ການຂຸດຄົ້ນຂໍ້ມູນແລະການສ້າງເງື່ອນໄຂປິດລ້ອມ. ລະບົບຍັງຮັບປະກັນຂໍ້ມູນທັງຫມົດຂອງທ່ານ, ການໂທວິດີໂອແບບຫນຶ່ງຕໍ່ຫນຶ່ງແລະການສື່ສານສຽງໂດຍຜ່ານການເຂົ້າລະຫັດແບບຕົ້ນທາງຫາປາຍທາງ ແລະການກວດສອບອຸປະກອນກ່ອນເຊື່ອມຕໍ່.
+
+ລະບົບເຮົາໃຫ້ທ່ານຄວບຄຸມຄວາມເປັນສ່ວນຕົວຂອງທ່ານໃນຂະນະທີ່ອະນຸຍາດໃຫ້ທ່ານຕິດຕໍ່ສື່ສານຢ່າງປອດໄພກັບທຸກຄົນໃນເຄືອຂ່າຍ Matrix, ຫຼືເຄື່ອງມືທີ່ທ່ານຄຸ້ນເຄີຍເຊັ່ນ Whatsapp, Slack, Facebook.
+
+<b>ທ່ານສາມາດສ້າງສະຖານີຂອງຕົນເອງ</b>
+ເພື່ອໃຫ້ສາມາດຄວບຄຸມຂໍ້ມູນແລະການສົນທະນາທີ່ລະອຽດອ່ອນຂອງທ່ານຫຼາຍຂຶ້ນ, ທ່ານສາມາດຕິດຕັ້ງສະຖານີສື່ສານຂອງຕົນເອງຫຼືທ່ານສາມາດເລືອກຕິດຕັ້ງໄວ້ກັບເຄືອຂ່າຍ Matrix - ມາດຕະຖານສໍາລັບລະບົບເປີດ, ການສື່ສານແບບກະຈາຍການຄຸ້ມຄອງ. ລະບົບພວກເຮົາໃຫ້ທ່ານມີຄວາມເປັນສ່ວນຕົວ, ໄດ້ຕາມມາດຕະຖານຄວາມປອດໄພແລະມີຄວາມຍືດຫຍຸ່ນໃນການເຊື່ອມໂຍງ.
+
+<b>ເປັນເຈົ້າຂອງຂໍ້ມູນຂອງທ່ານເອງ</b>
+ທ່ານສາມາດເລືອກໄດ້ວ່າຈະເກັບຂໍ້ມູນ ແລະຂໍ້ຄວາມຂອງທ່ານຢູ່ໃສ. ໂດຍບໍ່ມີຄວາມສ່ຽງຕໍ່ການຂຸດຄົ້ນຂໍ້ມູນຫຼືການເຂົ້າເຖິງຈາກພາກສ່ວນທີສາມ.
+
+ລະບົບພວກເຮົາເຮັດໃຫ້ທ່ານສາມາດຄວບຄຸມດ້ວຍວິທີຕ່າງໆ:
+1. ຮັບບັນຊີຟຣີໃນເຊີບເວີສາທາລະນະ matrix.org ທີ່ໂຮສໂດຍຜູ້ພັດທະນາ Matrix, ຫຼືເລືອກຈາກເຄື່ອງແມ່ຂ່າຍສາທາລະນະຫຼາຍພັນເຊີບເວີທີ່ໂຮສໂດຍອາສາສະໝັກ.
+2. ຈັດການບັນຊີຂອງທ່ານເອງໂດຍການແລ່ນເຊີບເວີໃນໂຄງລ່າງພື້ນຖານ IT ຂອງທ່ານເອງ
+3. ລົງທະບຽນສໍາລັບບັນຊີຢູ່ໃນເຄື່ອງແມ່ຂ່າຍທີ່ກໍາຫນົດເອງໂດຍພຽງແຕ່ສະຫມັກກັບ Element Matrix Services hosting platform
+
+<b>ສົ່ງຂໍ້ຄວາມ ແລະການຮ່ວມມືກັບລະບົບອື່ນໆທີ່ທ່ານຄຸ້ນເຄີຍ</b>
+ທ່ານສາມາດສົນທະນາກັບທຸກຄົນໃນເຄືອຂ່າຍ Matrix, ບໍ່ວ່າເຂົາເຈົ້າກໍາລັງໃຊ້ Element, ແອັບ Matrix ອື່ນ ຫຼືເຖິງແມ່ນວ່າເຂົາເຈົ້າກຳລັງໃຊ້ແອັບສົ່ງຂໍ້ຄວາມອື່ນຢູ່.
+
+<b>ປອດໄພທີ່ສຸດ</b>
+ການເຂົ້າລະຫັດຈາກຕົ້ນທາງຫາປາຍທາງ (ມີພຽງແຕ່ຜູ້ທີ່ຢູ່ໃນການສົນທະນາສາມາດຖອດລະຫັດຂໍ້ຄວາມໄດ້), ແລະການຢັ້ງຢືນອຸປະກອນໂດຍການລົງນາມຂ້າມອຸປະກອນ.
+
+<b>ການສື່ສານແລະການເຊື່ອມໂຍງທີ່ຄົບຖ້ວນສົມບູນ</b>
+ການສົ່ງຂໍ້ຄວາມ, ການໂທສຽງ ແລະວິດີໂອ, ການແບ່ງປັນໄຟລ໌, ການແບ່ງປັນໜ້າຈໍ ແລະການເຊື່ອມໂຍງທັງໝົດ, ບັອດ ແລະວິດເຈັດ. ສ້າງຫ້ອງ, ຊຸມຊົນ, ຕິດຕໍ່ພົວພັນແລະເຮັດສິ່ງຕ່າງໆ.
+
+<b>ສືບຕໍ່ຈາກການສົນທະນາລ້າສຸດ</b>
+ທ່ານສາມາດຕິດຕໍ່ພົວພັນໄດ້ທຸກບ່ອນທີ່ຕ້ອງການ ເຊິ່ງປະຫວັດການສົນທະນາຈະຖືກອັບເດດໄປຫາບັນດາອຸປະກອນຕ່າງໆຂອງທ່ານ ລວມເຖິງໃນເວັບໄຊຕ໌ທີ່ https://app.element.io
+
+<b>ເຕັກໂນໂລຊີໂອເພິນຊອດ</b>
+Element ເປັນໂຄງການເຕັກໂນໂລຊີໂອເພິນຊອດ, ເປັນເຈົ້າພາບໂດຍ GitHub. ກະລຸນາລາຍງານຂໍ້ບົກພ່ອງ ແລະ/ຫຼື ປະກອບສ່ວນເຂົ້າໃນການພັດທະນາຂອງລະບົບຢູ່ https://github.com/vector-im/element-android
diff --git a/fastlane/metadata/android/lo/short_description.txt b/fastlane/metadata/android/lo/short_description.txt
new file mode 100644
index 0000000000..625b078915
--- /dev/null
+++ b/fastlane/metadata/android/lo/short_description.txt
@@ -0,0 +1 @@
+ສົ່ງຂໍ້ຄວາມກຸ່ມ - ສົ່ງຂໍ້ຄວາມທີ່ເຂົ້າລະຫັດ, ສົນທະນາກຸ່ມ ແລະໂທວິດີໂອ
diff --git a/fastlane/metadata/android/lo/title.txt b/fastlane/metadata/android/lo/title.txt
new file mode 100644
index 0000000000..a9054d803b
--- /dev/null
+++ b/fastlane/metadata/android/lo/title.txt
@@ -0,0 +1 @@
+ລະບົບສື່ສານທີ່ມີຄວາມປອດໄພສູງ
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40103060.txt b/fastlane/metadata/android/pl-PL/changelogs/40103060.txt
new file mode 100644
index 0000000000..9dc1e9e297
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40103060.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Dodanie obsługi obecności, dla pokoju wiadomości bezpośrednich (uwaga: obecność jest wyłączona na matrix.org). Dodano ponownie obsługę Android Auto.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.3.6
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40103070.txt b/fastlane/metadata/android/pl-PL/changelogs/40103070.txt
index 2cb20a9570..08d9d2193e 100644
--- a/fastlane/metadata/android/pl-PL/changelogs/40103070.txt
+++ b/fastlane/metadata/android/pl-PL/changelogs/40103070.txt
@@ -1,2 +1,2 @@
-Główne zmiany w tej wersji: Poprawki błędów dotyczące głównie powiadomień
-Pełny changelog: https://github.com/vector-im/element-android/releases/tag/v1.3.7
+Główne zmiany w tej wersji: Poprawki błędów dotyczące głównie powiadomień.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.3.7-RC2
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40103080.txt b/fastlane/metadata/android/pl-PL/changelogs/40103080.txt
new file mode 100644
index 0000000000..c850479f59
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40103080.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Poprawki błędów!
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.3.8
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40103090.txt b/fastlane/metadata/android/pl-PL/changelogs/40103090.txt
new file mode 100644
index 0000000000..13e1aed51e
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40103090.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Dodano obsługę wersji roboczej wiadomości głosowych. Wiele poprawek!
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.3.9
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40103100.txt b/fastlane/metadata/android/pl-PL/changelogs/40103100.txt
new file mode 100644
index 0000000000..406f07f70f
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40103100.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Dodano obsługę ankiet (w laboratoriach). Nowy projekt podglądu adresu URL.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.3.10
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40103110.txt b/fastlane/metadata/android/pl-PL/changelogs/40103110.txt
new file mode 100644
index 0000000000..f9b38673c7
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40103110.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Poprawki błędów!
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.3.11
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40103120.txt b/fastlane/metadata/android/pl-PL/changelogs/40103120.txt
new file mode 100644
index 0000000000..db6c1c86bd
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40103120.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Poprawki błędów!
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.3.12
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40103130.txt b/fastlane/metadata/android/pl-PL/changelogs/40103130.txt
new file mode 100644
index 0000000000..affd085177
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40103130.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Pierwsza zmiana na ekranach rejestracji, w tym możliwość włączenia Analytics. Dodano obsługę dla wydarzeń z dodatkiem matematyki w laboratoriach.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.3.13
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40103140.txt b/fastlane/metadata/android/pl-PL/changelogs/40103140.txt
new file mode 100644
index 0000000000..0727d3b4ff
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40103140.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Pierwsza zmiana na ekranach rejestracji, w tym możliwość włączenia Analytics. Dodano obsługę dla wydarzeń z dodatkiem matematyki w laboratoriach.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.3.14
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40103150.txt b/fastlane/metadata/android/pl-PL/changelogs/40103150.txt
new file mode 100644
index 0000000000..48d6d0feb3
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40103150.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Pierwsza zmiana na ekranach rejestracji, w tym możliwość włączenia Analytics. Dodano obsługę dla wydarzeń z dodatkiem matematyki w laboratoriach.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.3.15
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40103160.txt b/fastlane/metadata/android/pl-PL/changelogs/40103160.txt
new file mode 100644
index 0000000000..df66e3042a
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40103160.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: wyślij swoją lokalizację do dowolnego pokoju. Edytuj ankietę.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.3.16
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40103170.txt b/fastlane/metadata/android/pl-PL/changelogs/40103170.txt
new file mode 100644
index 0000000000..77d40898a6
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40103170.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: wyślij swoją lokalizację do dowolnego pokoju. Edytuj ankietę.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.3.17
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40103180.txt b/fastlane/metadata/android/pl-PL/changelogs/40103180.txt
new file mode 100644
index 0000000000..c0f671a58e
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40103180.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: wyślij swoją lokalizację do dowolnego pokoju. Edytuj ankietę.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.3.18
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40104000.txt b/fastlane/metadata/android/pl-PL/changelogs/40104000.txt
new file mode 100644
index 0000000000..f9f4c80cf9
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40104000.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Wstępna implementacja komunikatów wątków. Bąbelki wiadomości.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.4.0
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40104020.txt b/fastlane/metadata/android/pl-PL/changelogs/40104020.txt
new file mode 100644
index 0000000000..190427d548
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40104020.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: dodanie obsługi @room i nieujawnionych ankiet, i wiele innych drobnych zmian.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.4.2
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40104040.txt b/fastlane/metadata/android/pl-PL/changelogs/40104040.txt
new file mode 100644
index 0000000000..9894e54c03
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40104040.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: aktualizacje interfejsu użytkownika wskaźnika pisania. Różne poprawki błędów i ulepszenia stabilności.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.4.4
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40104060.txt b/fastlane/metadata/android/pl-PL/changelogs/40104060.txt
new file mode 100644
index 0000000000..216842ada0
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40104060.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Oś czasu wątku jest teraz aktywna i szybsza. Różne poprawki błędów i ulepszenia stabilności.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.4.6
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40104070.txt b/fastlane/metadata/android/pl-PL/changelogs/40104070.txt
new file mode 100644
index 0000000000..91c13d3d79
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40104070.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Różne poprawki błędów i ulepszenia stabilności.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases/tag/v1.4.7
diff --git a/fastlane/metadata/android/pl-PL/changelogs/40104080.txt b/fastlane/metadata/android/pl-PL/changelogs/40104080.txt
new file mode 100644
index 0000000000..5286f40de5
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/40104080.txt
@@ -0,0 +1,2 @@
+Główne zmiany w tej wersji: Oś czasu wątku jest teraz aktywna i szybsza. Różne poprawki błędów i ulepszenia stabilności.
+Pełna lista zmian: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40104060.txt b/fastlane/metadata/android/pt-BR/changelogs/40104060.txt
new file mode 100644
index 0000000000..17d8225c0d
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40104060.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Timeline de Thread estão agora ao vivo e mais rápidas. Vários consertos de bugs e melhorias de estabilidade.
+Changelog completo: https://github.com/vector-im/element-android/releases/tag/v1.4.6
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40104070.txt b/fastlane/metadata/android/pt-BR/changelogs/40104070.txt
new file mode 100644
index 0000000000..fad9bfe739
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40104070.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Vários consertos de bugs e melhorias de estabilidade.
+Changelog completo: https://github.com/vector-im/element-android/releases/tag/v1.4.7
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40104080.txt b/fastlane/metadata/android/pt-BR/changelogs/40104080.txt
new file mode 100644
index 0000000000..ca2b54f2f2
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40104080.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Timeline de Thread estão agora ao vivo e mais rápidas. Vários consertos de bugs e melhorias de estabilidade.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40104100.txt b/fastlane/metadata/android/pt-BR/changelogs/40104100.txt
new file mode 100644
index 0000000000..eb746aca2b
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40104100.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Rolar em mensagem de voz. Vários consertos de bugs e melhorias de estabilidade.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40104110.txt b/fastlane/metadata/android/pt-BR/changelogs/40104110.txt
new file mode 100644
index 0000000000..6e11e92579
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40104110.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Vários consertos de bugs e melhorias de estabilidade.
+Changelog completo: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40104060.txt b/fastlane/metadata/android/sk/changelogs/40104060.txt
new file mode 100644
index 0000000000..53e192fe7c
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40104060.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Vlákna na časovej osi sú teraz živé a rýchlejšie. Rôzne opravy chýb a vylepšenia stability.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases/tag/v1.4.6
diff --git a/fastlane/metadata/android/sk/changelogs/40104070.txt b/fastlane/metadata/android/sk/changelogs/40104070.txt
new file mode 100644
index 0000000000..1e056cf32f
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40104070.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Rôzne opravy chýb a vylepšenia stability.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases/tag/v1.4.7
diff --git a/fastlane/metadata/android/sk/changelogs/40104080.txt b/fastlane/metadata/android/sk/changelogs/40104080.txt
new file mode 100644
index 0000000000..7f42250fb9
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40104080.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Vlákna na časovej osi sú teraz živé a rýchlejšie. Rôzne opravy chýb a vylepšenia stability.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40104100.txt b/fastlane/metadata/android/sk/changelogs/40104100.txt
new file mode 100644
index 0000000000..b96a539364
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40104100.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Posúvanie v hlasovej správe. Rôzne opravy chýb a vylepšenia stability.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40104110.txt b/fastlane/metadata/android/sk/changelogs/40104110.txt
new file mode 100644
index 0000000000..50670f18c2
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40104110.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Rôzne opravy chýb a vylepšenia stability.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40104060.txt b/fastlane/metadata/android/sq/changelogs/40104060.txt
new file mode 100644
index 0000000000..48cbd2150c
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104060.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Vijat kohore të rrjedhave tani janë në punë dhe më të shpejta. Ndreqje të metash të ndryshme dhe përmirësime qëndrueshmërie.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases/tag/v1.4.6
diff --git a/fastlane/metadata/android/sq/changelogs/40104070.txt b/fastlane/metadata/android/sq/changelogs/40104070.txt
new file mode 100644
index 0000000000..ad487c57ee
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104070.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Ndreqje të metash të ndryshme dhe përmirësime qëndrueshmërie.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases/tag/v1.4.7
diff --git a/fastlane/metadata/android/sq/changelogs/40104080.txt b/fastlane/metadata/android/sq/changelogs/40104080.txt
new file mode 100644
index 0000000000..49156d0c96
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104080.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Vijat kohore të rrjedhave tani janë në punë dhe më të shpejta. Ndreqje të metash të ndryshme dhe përmirësime qëndrueshmërie.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40104100.txt b/fastlane/metadata/android/sq/changelogs/40104100.txt
new file mode 100644
index 0000000000..c45c2b9a33
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104100.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Rrëshqitje në mesazh zanor. Ndreqje të metash të ndryshme dhe përmirësime qëndrueshmërie.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sq/changelogs/40104110.txt b/fastlane/metadata/android/sq/changelogs/40104110.txt
new file mode 100644
index 0000000000..df9b377adb
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/40104110.txt
@@ -0,0 +1,2 @@
+Ndryshimet kryesore në këtë version: Ndreqje të metash të ndryshme dhe përmirësime qëndrueshmërie.
+Regjistër i plotë ndryshimesh: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40104060.txt b/fastlane/metadata/android/sv-SE/changelogs/40104060.txt
new file mode 100644
index 0000000000..16a49fa3bc
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40104060.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Trådtidslinje är nu live och snabbare. Diverse buggfixar och stabilitetsförbättringar.
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.4.6
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40104070.txt b/fastlane/metadata/android/sv-SE/changelogs/40104070.txt
new file mode 100644
index 0000000000..01f79e85d6
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40104070.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Diverse buggfixar och stabilitetsförbättringar.
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.4.7
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40104080.txt b/fastlane/metadata/android/sv-SE/changelogs/40104080.txt
new file mode 100644
index 0000000000..2ac7df2cda
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40104080.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Trådtidslinje är nu live och snabbare. Diverse buggfixar och stabilitetsförbättringar.
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.4.8
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40104100.txt b/fastlane/metadata/android/sv-SE/changelogs/40104100.txt
new file mode 100644
index 0000000000..a1585aacf5
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40104100.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i denna version: Scrolla i röstmeddelanden. Diverse buggfixar och förbättrad stabilitet.
+Fullständig lista över ändringar: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40104110.txt b/fastlane/metadata/android/sv-SE/changelogs/40104110.txt
new file mode 100644
index 0000000000..92cce13669
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40104110.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i denna version: Diverse buggfixar och förbättrad stabilitet.
+Fullständig lista över ändringar: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/changelogs/40104060.txt b/fastlane/metadata/android/uk/changelogs/40104060.txt
new file mode 100644
index 0000000000..28f051724a
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40104060.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: Хронологія тредів працює наживо і швидше. Усунуто різні вади й поліпшено стабільність.
+Вичерпний перелік змін: https://github.com/vector-im/element-android/releases/tag/v1.4.6
diff --git a/fastlane/metadata/android/uk/changelogs/40104070.txt b/fastlane/metadata/android/uk/changelogs/40104070.txt
new file mode 100644
index 0000000000..dff28b7825
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40104070.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: Усунуто різні вади й поліпшено стабільність.
+Вичерпний перелік змін: https://github.com/vector-im/element-android/releases/tag/v1.4.7
diff --git a/fastlane/metadata/android/uk/changelogs/40104080.txt b/fastlane/metadata/android/uk/changelogs/40104080.txt
new file mode 100644
index 0000000000..e5f7e7b271
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40104080.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: Хронологія тредів працює наживо і швидше. Усунуто різні вади й поліпшено стабільність.
+Вичерпний перелік змін: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/changelogs/40104100.txt b/fastlane/metadata/android/uk/changelogs/40104100.txt
new file mode 100644
index 0000000000..93c9fe4b70
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40104100.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: Прокручування в голосових повідомленнях. Усунуто різні вади й поліпшено стабільність.
+Вичерпний перелік змін: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/changelogs/40104110.txt b/fastlane/metadata/android/uk/changelogs/40104110.txt
new file mode 100644
index 0000000000..252a57c9d9
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40104110.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: Усунуто різні вади й поліпшено стабільність.
+Вичерпний перелік змін: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40104060.txt b/fastlane/metadata/android/zh-TW/changelogs/40104060.txt
new file mode 100644
index 0000000000..316fad3363
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40104060.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：討論串時間軸現已更新，而且更快了。多個臭蟲修復與穩定性改善。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases/tag/v1.4.6
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40104070.txt b/fastlane/metadata/android/zh-TW/changelogs/40104070.txt
new file mode 100644
index 0000000000..2cd9da666e
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40104070.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：多個臭蟲修復與穩定性改善。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases/tag/v1.4.7
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40104080.txt b/fastlane/metadata/android/zh-TW/changelogs/40104080.txt
new file mode 100644
index 0000000000..c036aa7d56
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40104080.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：討論串時間軸現已更新，而且更快了。多個臭蟲修復與穩定性改善。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40104100.txt b/fastlane/metadata/android/zh-TW/changelogs/40104100.txt
new file mode 100644
index 0000000000..c78ed7dd2d
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40104100.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：捲動音訊訊息。多個臭蟲修復與穩定性改善。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40104110.txt b/fastlane/metadata/android/zh-TW/changelogs/40104110.txt
new file mode 100644
index 0000000000..4bcca9a0b8
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40104110.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：多個臭蟲修復與穩定性改善。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt
index 99686eaabb..7b54438a52 100644
--- a/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt
+++ b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt
@@ -37,7 +37,7 @@ interface ImageLoaderTarget {
 }
 
 internal class DefaultImageLoaderTarget(val holder: AnimatedImageViewHolder, private val contextView: ImageView) :
-    ImageLoaderTarget {
+        ImageLoaderTarget {
     override fun contextView(): ImageView {
         return contextView
     }
diff --git a/library/jsonviewer/build.gradle b/library/jsonviewer/build.gradle
index 0cad8ac171..2110747feb 100644
--- a/library/jsonviewer/build.gradle
+++ b/library/jsonviewer/build.gradle
@@ -6,8 +6,14 @@ apply plugin: 'com.jakewharton.butterknife'
 
 buildscript {
     repositories {
-        google()
-        mavenCentral()
+        // Do not use `google()`, it prevents Dependabot from working properly
+        maven {
+            url 'https://maven.google.com'
+        }
+        // Do not use `mavenCentral()`, it prevents Dependabot from working properly
+        maven {
+            url 'https://repo1.maven.org/maven2'
+        }
     }
     dependencies {
         classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.3'
diff --git a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerDialog.kt b/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerDialog.kt
index a8d9cac849..0ebf539d4d 100644
--- a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerDialog.kt
+++ b/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerDialog.kt
@@ -27,9 +27,9 @@ import com.airbnb.mvrx.Mavericks
 class JSonViewerDialog : DialogFragment() {
 
     override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
+            inflater: LayoutInflater,
+            container: ViewGroup?,
+            savedInstanceState: Bundle?
     ): View? {
         return inflater.inflate(R.layout.fragment_dialog_jv, container, false)
     }
@@ -39,15 +39,15 @@ class JSonViewerDialog : DialogFragment() {
         val args: JSonViewerFragmentArgs = arguments?.getParcelable(Mavericks.KEY_ARG) ?: return
         if (savedInstanceState == null) {
             childFragmentManager.beginTransaction()
-                .replace(
-                    R.id.fragmentContainer, JSonViewerFragment.newInstance(
-                        args.jsonString,
-                        args.defaultOpenDepth,
-                        true,
-                        args.styleProvider
+                    .replace(
+                            R.id.fragmentContainer, JSonViewerFragment.newInstance(
+                            args.jsonString,
+                            args.defaultOpenDepth,
+                            true,
+                            args.styleProvider
                     )
-                )
-                .commitNow()
+                    )
+                    .commitNow()
         }
     }
 
@@ -63,13 +63,13 @@ class JSonViewerDialog : DialogFragment() {
 
     companion object {
         fun newInstance(
-            jsonString: String,
-            initialOpenDepth: Int = -1,
-            styleProvider: JSonViewerStyleProvider? = null
+                jsonString: String,
+                initialOpenDepth: Int = -1,
+                styleProvider: JSonViewerStyleProvider? = null
         ): JSonViewerDialog {
             val args = Bundle()
             val parcelableArgs =
-                JSonViewerFragmentArgs(jsonString, initialOpenDepth, false, styleProvider)
+                    JSonViewerFragmentArgs(jsonString, initialOpenDepth, false, styleProvider)
             args.putParcelable(Mavericks.KEY_ARG, parcelableArgs)
             return JSonViewerDialog().apply { arguments = args }
         }
diff --git a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerFragment.kt b/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerFragment.kt
index 51e2797958..fbf6f88bc3 100644
--- a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerFragment.kt
+++ b/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerFragment.kt
@@ -32,10 +32,10 @@ import kotlinx.parcelize.Parcelize
 
 @Parcelize
 internal data class JSonViewerFragmentArgs(
-    val jsonString: String,
-    val defaultOpenDepth: Int,
-    val wrap: Boolean,
-    val styleProvider: JSonViewerStyleProvider?
+        val jsonString: String,
+        val defaultOpenDepth: Int,
+        val wrap: Boolean,
+        val styleProvider: JSonViewerStyleProvider?
 ) : Parcelable
 
 class JSonViewerFragment : Fragment(), MavericksView {
@@ -49,20 +49,20 @@ class JSonViewerFragment : Fragment(), MavericksView {
     private lateinit var recyclerView: EpoxyRecyclerView
 
     override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
+            inflater: LayoutInflater,
+            container: ViewGroup?,
+            savedInstanceState: Bundle?
     ): View? {
         val args: JSonViewerFragmentArgs? = arguments?.getParcelable(Mavericks.KEY_ARG)
         val inflate =
-            if (args?.wrap == true) {
-                inflater.inflate(R.layout.fragment_jv_recycler_view_wrap, container, false)
-            } else {
-                inflater.inflate(R.layout.fragment_jv_recycler_view, container, false)
-            }
+                if (args?.wrap == true) {
+                    inflater.inflate(R.layout.fragment_jv_recycler_view_wrap, container, false)
+                } else {
+                    inflater.inflate(R.layout.fragment_jv_recycler_view, container, false)
+                }
         recyclerView = inflate.findViewById(R.id.jvRecyclerView)
         recyclerView.layoutManager =
-            LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+                LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
         recyclerView.setController(epoxyController)
         epoxyController.setStyle(args?.styleProvider)
         registerForContextMenu(recyclerView)
@@ -79,21 +79,21 @@ class JSonViewerFragment : Fragment(), MavericksView {
 
     companion object {
         fun newInstance(
-            jsonString: String,
-            initialOpenDepth: Int = -1,
-            wrap: Boolean = false,
-            styleProvider: JSonViewerStyleProvider? = null
+                jsonString: String,
+                initialOpenDepth: Int = -1,
+                wrap: Boolean = false,
+                styleProvider: JSonViewerStyleProvider? = null
         ): JSonViewerFragment {
             return JSonViewerFragment().apply {
                 arguments = Bundle().apply {
                     putParcelable(
-                        Mavericks.KEY_ARG,
-                        JSonViewerFragmentArgs(
-                            jsonString,
-                            initialOpenDepth,
-                            wrap,
-                            styleProvider
-                        )
+                            Mavericks.KEY_ARG,
+                            JSonViewerFragmentArgs(
+                                    jsonString,
+                                    initialOpenDepth,
+                                    wrap,
+                                    styleProvider
+                            )
                     )
                 }
             }
diff --git a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerModel.kt b/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerModel.kt
index 3d1f8dd3e2..6940e79e3f 100644
--- a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerModel.kt
+++ b/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerModel.kt
@@ -30,8 +30,8 @@ internal interface Composed {
 }
 
 internal class JSonViewerObject(key: String?, index: Int?, jObject: JSONObject) :
-    JSonViewerModel(key, index, jObject),
-    Composed {
+        JSonViewerModel(key, index, jObject),
+        Composed {
 
     var keys = LinkedHashMap<String, JSonViewerModel>()
 
@@ -41,7 +41,7 @@ internal class JSonViewerObject(key: String?, index: Int?, jObject: JSONObject)
 }
 
 internal class JSonViewerArray(key: String?, index: Int?, jObject: JSONArray) :
-    JSonViewerModel(key, index, jObject), Composed {
+        JSonViewerModel(key, index, jObject), Composed {
     var items = ArrayList<JSonViewerModel>()
 
     override fun addChild(model: JSonViewerModel) {
@@ -50,7 +50,7 @@ internal class JSonViewerArray(key: String?, index: Int?, jObject: JSONArray) :
 }
 
 internal class JSonViewerLeaf(key: String?, index: Int?, val stringRes: String, val type: JSONType) :
-    JSonViewerModel(key, index, stringRes)
+        JSonViewerModel(key, index, stringRes)
 
 internal enum class JSONType {
     STRING,
@@ -75,41 +75,41 @@ internal object ModelParser {
         when (obj) {
             is JSONObject -> {
                 val objectComposed = JSonViewerObject(key, index, obj)
-                    .apply { isExpanded = initialOpenDepth == -1 || depth <= initialOpenDepth }
+                        .apply { isExpanded = initialOpenDepth == -1 || depth <= initialOpenDepth }
                 objectComposed.depth = depth
                 obj.keys().forEach {
                     eval(objectComposed, it, null, obj.get(it), depth + 1, initialOpenDepth)
                 }
                 parent.addChild(objectComposed)
             }
-            is JSONArray -> {
+            is JSONArray  -> {
                 val objectComposed = JSonViewerArray(key, index, obj)
-                    .apply { isExpanded = initialOpenDepth == -1 || depth <= initialOpenDepth }
+                        .apply { isExpanded = initialOpenDepth == -1 || depth <= initialOpenDepth }
                 objectComposed.depth = depth
                 for (i in 0 until obj.length()) {
                     eval(objectComposed, null, i, obj[i], depth + 1, initialOpenDepth)
                 }
                 parent.addChild(objectComposed)
             }
-            is String -> {
-                JSonViewerLeaf(key, index,  obj, JSONType.STRING).let {
+            is String     -> {
+                JSonViewerLeaf(key, index, obj, JSONType.STRING).let {
                     it.depth = depth
                     parent.addChild(it)
                 }
             }
-            is Number -> {
+            is Number     -> {
                 JSonViewerLeaf(key, index, obj.toString(), JSONType.NUMBER).let {
                     it.depth = depth
                     parent.addChild(it)
                 }
             }
-            is Boolean -> {
+            is Boolean    -> {
                 JSonViewerLeaf(key, index, obj.toString(), JSONType.BOOLEAN).let {
                     it.depth = depth
                     parent.addChild(it)
                 }
             }
-            else -> {
+            else          -> {
                 if (obj == JSONObject.NULL) {
                     JSonViewerLeaf(key, index, "null", JSONType.NULL).let {
                         it.depth = depth
diff --git a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerStyleProvider.kt b/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerStyleProvider.kt
index 4fc04c91e4..17d8034f2d 100644
--- a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerStyleProvider.kt
+++ b/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerStyleProvider.kt
@@ -24,22 +24,22 @@ import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class JSonViewerStyleProvider(
-    @ColorInt val keyColor: Int,
-    @ColorInt val stringColor: Int,
-    @ColorInt val booleanColor: Int,
-    @ColorInt val numberColor: Int,
-    @ColorInt val baseColor: Int,
-    @ColorInt val secondaryColor: Int
+        @ColorInt val keyColor: Int,
+        @ColorInt val stringColor: Int,
+        @ColorInt val booleanColor: Int,
+        @ColorInt val numberColor: Int,
+        @ColorInt val baseColor: Int,
+        @ColorInt val secondaryColor: Int
 ) : Parcelable {
 
     companion object {
         fun default(context: Context) = JSonViewerStyleProvider(
-            keyColor = ContextCompat.getColor(context, R.color.key_color),
-            stringColor = ContextCompat.getColor(context, R.color.string_color),
-            booleanColor = ContextCompat.getColor(context, R.color.bool_color),
-            numberColor = ContextCompat.getColor(context, R.color.number_color),
-            baseColor = ContextCompat.getColor(context, R.color.base_color),
-            secondaryColor = ContextCompat.getColor(context, R.color.secondary_color)
+                keyColor = ContextCompat.getColor(context, R.color.key_color),
+                stringColor = ContextCompat.getColor(context, R.color.string_color),
+                booleanColor = ContextCompat.getColor(context, R.color.bool_color),
+                numberColor = ContextCompat.getColor(context, R.color.number_color),
+                baseColor = ContextCompat.getColor(context, R.color.base_color),
+                secondaryColor = ContextCompat.getColor(context, R.color.secondary_color)
         )
     }
 }
diff --git a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerViewModel.kt b/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerViewModel.kt
index bc3f022cfa..d4e8f42604 100644
--- a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerViewModel.kt
+++ b/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerViewModel.kt
@@ -28,11 +28,11 @@ import com.airbnb.mvrx.ViewModelContext
 import kotlinx.coroutines.launch
 
 internal data class JSonViewerState(
-    val root: Async<JSonViewerObject> = Uninitialized
+        val root: Async<JSonViewerObject> = Uninitialized
 ) : MavericksState
 
 internal class JSonViewerViewModel(initialState: JSonViewerState) :
-    MavericksViewModel<JSonViewerState>(initialState) {
+        MavericksViewModel<JSonViewerState>(initialState) {
 
     fun setJsonSource(json: String, initialOpenDepth: Int) {
         setState {
@@ -43,14 +43,14 @@ internal class JSonViewerViewModel(initialState: JSonViewerState) :
                 ModelParser.fromJsonString(json, initialOpenDepth).let {
                     setState {
                         copy(
-                            root = Success(it)
+                                root = Success(it)
                         )
                     }
                 }
             } catch (error: Throwable) {
                 setState {
                     copy(
-                        root = Fail(error)
+                            root = Fail(error)
                     )
                 }
             }
@@ -64,7 +64,7 @@ internal class JSonViewerViewModel(initialState: JSonViewerState) :
             val arg: JSonViewerFragmentArgs = viewModelContext.args()
             return try {
                 JSonViewerState(
-                    Success(ModelParser.fromJsonString(arg.jsonString, arg.defaultOpenDepth))
+                        Success(ModelParser.fromJsonString(arg.jsonString, arg.defaultOpenDepth))
                 )
             } catch (failure: Throwable) {
                 JSonViewerState(Fail(failure))
diff --git a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/Utils.kt b/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/Utils.kt
index efb2bfd855..0ac1cfe5f6 100644
--- a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/Utils.kt
+++ b/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/Utils.kt
@@ -22,9 +22,9 @@ import android.util.TypedValue
 internal object Utils {
     fun dpToPx(dp: Int, context: Context): Int {
         return TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP,
-            dp.toFloat(),
-            context.resources.displayMetrics
+                TypedValue.COMPLEX_UNIT_DIP,
+                dp.toFloat(),
+                context.resources.displayMetrics
         ).toInt()
     }
 }
diff --git a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/ValueItem.kt b/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/ValueItem.kt
index 00d66645e6..fac7099b37 100644
--- a/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/ValueItem.kt
+++ b/library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/ValueItem.kt
@@ -71,14 +71,14 @@ internal abstract class ValueItem : EpoxyModelWithHolder<ValueItem.Holder>() {
         }
 
         override fun onCreateContextMenu(
-            menu: ContextMenu?,
-            v: View?,
-            menuInfo: ContextMenu.ContextMenuInfo?
+                menu: ContextMenu?,
+                v: View?,
+                menuInfo: ContextMenu.ContextMenuInfo?
         ) {
             if (copyValue != null) {
                 val menuItem = menu?.add(R.string.copy_value)
                 val clipService =
-                    v?.context?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
+                        v?.context?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
                 menuItem?.setOnMenuItemClickListener {
                     clipService?.setPrimaryClip(ClipData.newPlainText("", copyValue))
                     true
diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt
index b1442a56e1..785b9fae43 100644
--- a/library/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt
+++ b/library/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt
@@ -23,11 +23,9 @@ import android.provider.MediaStore
 import androidx.activity.result.ActivityResultLauncher
 import androidx.core.content.FileProvider
 import im.vector.lib.multipicker.entity.MultiPickerImageType
+import im.vector.lib.multipicker.utils.MediaType
+import im.vector.lib.multipicker.utils.createTemporaryMediaFile
 import im.vector.lib.multipicker.utils.toMultiPickerImageType
-import java.io.File
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
 
 /**
  * Implementation of taking a photo with Camera
@@ -38,7 +36,7 @@ class CameraPicker {
      * Start camera by using a ActivityResultLauncher
      * @return Uri of taken photo or null if the operation is cancelled.
      */
-    fun startWithExpectingFile(context: Context, activityResultLauncher: ActivityResultLauncher<Intent>): Uri? {
+    fun startWithExpectingFile(context: Context, activityResultLauncher: ActivityResultLauncher<Intent>): Uri {
         val photoUri = createPhotoUri(context)
         val intent = createIntent().apply {
             putExtra(MediaStore.EXTRA_OUTPUT, photoUri)
@@ -63,19 +61,9 @@ class CameraPicker {
 
     companion object {
         fun createPhotoUri(context: Context): Uri {
-            val file = createImageFile(context)
+            val file = createTemporaryMediaFile(context, MediaType.IMAGE)
             val authority = context.packageName + ".multipicker.fileprovider"
             return FileProvider.getUriForFile(context, authority, file)
         }
-
-        private fun createImageFile(context: Context): File {
-            val timeStamp: String = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date())
-            val storageDir: File = context.filesDir
-            return File.createTempFile(
-                    "${timeStamp}_", /* prefix */
-                    ".jpg", /* suffix */
-                    storageDir /* directory */
-            )
-        }
     }
 }
diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/CameraVideoPicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/CameraVideoPicker.kt
index 76342b6e2e..59601b30d9 100644
--- a/library/multipicker/src/main/java/im/vector/lib/multipicker/CameraVideoPicker.kt
+++ b/library/multipicker/src/main/java/im/vector/lib/multipicker/CameraVideoPicker.kt
@@ -23,11 +23,9 @@ import android.provider.MediaStore
 import androidx.activity.result.ActivityResultLauncher
 import androidx.core.content.FileProvider
 import im.vector.lib.multipicker.entity.MultiPickerVideoType
+import im.vector.lib.multipicker.utils.MediaType
+import im.vector.lib.multipicker.utils.createTemporaryMediaFile
 import im.vector.lib.multipicker.utils.toMultiPickerVideoType
-import java.io.File
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
 
 /**
  * Implementation of taking a video with Camera
@@ -38,7 +36,7 @@ class CameraVideoPicker {
      * Start camera by using a ActivityResultLauncher
      * @return Uri of taken photo or null if the operation is cancelled.
      */
-    fun startWithExpectingFile(context: Context, activityResultLauncher: ActivityResultLauncher<Intent>): Uri? {
+    fun startWithExpectingFile(context: Context, activityResultLauncher: ActivityResultLauncher<Intent>): Uri {
         val videoUri = createVideoUri(context)
         val intent = createIntent().apply {
             putExtra(MediaStore.EXTRA_OUTPUT, videoUri)
@@ -63,19 +61,9 @@ class CameraVideoPicker {
 
     companion object {
         fun createVideoUri(context: Context): Uri {
-            val file = createVideoFile(context)
+            val file = createTemporaryMediaFile(context, MediaType.VIDEO)
             val authority = context.packageName + ".multipicker.fileprovider"
             return FileProvider.getUriForFile(context, authority, file)
         }
-
-        private fun createVideoFile(context: Context): File {
-            val timeStamp: String = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date())
-            val storageDir: File = context.filesDir
-            return File.createTempFile(
-                    "${timeStamp}_", /* prefix */
-                    ".mp4", /* suffix */
-                    storageDir /* directory */
-            )
-        }
     }
 }
diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt
index 6ce50f622a..821c2f0d4c 100644
--- a/library/multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt
+++ b/library/multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt
@@ -31,15 +31,15 @@ class MultiPicker<T> {
         @Suppress("UNCHECKED_CAST")
         fun <T> get(type: MultiPicker<T>): T {
             return when (type) {
-                IMAGE   -> ImagePicker() as T
-                VIDEO   -> VideoPicker() as T
-                MEDIA   -> MediaPicker() as T
-                FILE    -> FilePicker() as T
-                AUDIO   -> AudioPicker() as T
-                CONTACT -> ContactPicker() as T
-                CAMERA  -> CameraPicker() as T
-                CAMERA_VIDEO  -> CameraVideoPicker() as T
-                else    -> throw IllegalArgumentException("Unsupported type $type")
+                IMAGE        -> ImagePicker() as T
+                VIDEO        -> VideoPicker() as T
+                MEDIA        -> MediaPicker() as T
+                FILE         -> FilePicker() as T
+                AUDIO        -> AudioPicker() as T
+                CONTACT      -> ContactPicker() as T
+                CAMERA       -> CameraPicker() as T
+                CAMERA_VIDEO -> CameraVideoPicker() as T
+                else         -> throw IllegalArgumentException("Unsupported type $type")
             }
         }
     }
diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/utils/MediaFileUtils.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/utils/MediaFileUtils.kt
new file mode 100644
index 0000000000..a029d5e6b1
--- /dev/null
+++ b/library/multipicker/src/main/java/im/vector/lib/multipicker/utils/MediaFileUtils.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.lib.multipicker.utils
+
+import android.content.Context
+import java.io.File
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+internal fun createTemporaryMediaFile(context: Context, mediaType: MediaType): File {
+    val timeStamp: String = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date())
+    val storageDir: File = context.filesDir.also { it.mkdirs() }
+    val fileSuffix = when (mediaType) {
+        MediaType.IMAGE -> ".jpg"
+        MediaType.VIDEO -> ".mp4"
+    }
+
+    return File.createTempFile(
+            "${timeStamp}_",
+            fileSuffix,
+            storageDir
+    )
+}
+
+internal enum class MediaType {
+    IMAGE, VIDEO
+}
diff --git a/matrix-sdk-android-flow/src/main/java/org/matrix/android/sdk/flow/FlowRoom.kt b/matrix-sdk-android-flow/src/main/java/org/matrix/android/sdk/flow/FlowRoom.kt
index d737715306..90546756b8 100644
--- a/matrix-sdk-android-flow/src/main/java/org/matrix/android/sdk/flow/FlowRoom.kt
+++ b/matrix-sdk-android-flow/src/main/java/org/matrix/android/sdk/flow/FlowRoom.kt
@@ -21,6 +21,8 @@ import kotlinx.coroutines.flow.Flow
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.getStateEvent
+import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.api.session.room.members.RoomMemberQueryParams
 import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
 import org.matrix.android.sdk.api.session.room.model.ReadReceipt
@@ -45,79 +47,81 @@ class FlowRoom(private val room: Room) {
     }
 
     fun liveRoomMembers(queryParams: RoomMemberQueryParams): Flow<List<RoomMemberSummary>> {
-        return room.getRoomMembersLive(queryParams).asFlow()
+        return room.membershipService().getRoomMembersLive(queryParams).asFlow()
                 .startWith(room.coroutineDispatchers.io) {
-                    room.getRoomMembers(queryParams)
+                    room.membershipService().getRoomMembers(queryParams)
                 }
     }
 
     fun liveAnnotationSummary(eventId: String): Flow<Optional<EventAnnotationsSummary>> {
-        return room.getEventAnnotationsSummaryLive(eventId).asFlow()
+        return room.relationService().getEventAnnotationsSummaryLive(eventId).asFlow()
                 .startWith(room.coroutineDispatchers.io) {
-                    room.getEventAnnotationsSummary(eventId).toOptional()
+                    room.relationService().getEventAnnotationsSummary(eventId).toOptional()
                 }
     }
 
     fun liveTimelineEvent(eventId: String): Flow<Optional<TimelineEvent>> {
-        return room.getTimelineEventLive(eventId).asFlow()
+        return room.timelineService().getTimelineEventLive(eventId).asFlow()
                 .startWith(room.coroutineDispatchers.io) {
                     room.getTimelineEvent(eventId).toOptional()
                 }
     }
 
     fun liveStateEvent(eventType: String, stateKey: QueryStringValue): Flow<Optional<Event>> {
-        return room.getStateEventLive(eventType, stateKey).asFlow()
+        return room.stateService().getStateEventLive(eventType, stateKey).asFlow()
                 .startWith(room.coroutineDispatchers.io) {
                     room.getStateEvent(eventType, stateKey).toOptional()
                 }
     }
 
     fun liveStateEvents(eventTypes: Set<String>): Flow<List<Event>> {
-        return room.getStateEventsLive(eventTypes).asFlow()
+        return room.stateService().getStateEventsLive(eventTypes).asFlow()
                 .startWith(room.coroutineDispatchers.io) {
-                    room.getStateEvents(eventTypes)
+                    room.stateService().getStateEvents(eventTypes)
                 }
     }
 
     fun liveReadMarker(): Flow<Optional<String>> {
-        return room.getReadMarkerLive().asFlow()
+        return room.readService().getReadMarkerLive().asFlow()
     }
 
     fun liveReadReceipt(): Flow<Optional<String>> {
-        return room.getMyReadReceiptLive().asFlow()
+        return room.readService().getMyReadReceiptLive().asFlow()
     }
 
     fun liveEventReadReceipts(eventId: String): Flow<List<ReadReceipt>> {
-        return room.getEventReadReceiptsLive(eventId).asFlow()
+        return room.readService().getEventReadReceiptsLive(eventId).asFlow()
     }
 
     fun liveDraft(): Flow<Optional<UserDraft>> {
-        return room.getDraftLive().asFlow()
+        return room.draftService().getDraftLive().asFlow()
                 .startWith(room.coroutineDispatchers.io) {
-                    room.getDraft().toOptional()
+                    room.draftService().getDraft().toOptional()
                 }
     }
 
     fun liveNotificationState(): Flow<RoomNotificationState> {
-        return room.getLiveRoomNotificationState().asFlow()
+        return room.roomPushRuleService().getLiveRoomNotificationState().asFlow()
     }
 
     fun liveThreadSummaries(): Flow<List<ThreadSummary>> {
-        return room.getAllThreadSummariesLive().asFlow()
+        return room.threadsService().getAllThreadSummariesLive().asFlow()
                 .startWith(room.coroutineDispatchers.io) {
-                    room.getAllThreadSummaries()
+                    room.threadsService().getAllThreadSummaries()
                 }
     }
+
     fun liveThreadList(): Flow<List<ThreadRootEvent>> {
-        return room.getAllThreadsLive().asFlow()
+        return room.threadsLocalService().getAllThreadsLive().asFlow()
                 .startWith(room.coroutineDispatchers.io) {
-                    room.getAllThreads()
+                    room.threadsLocalService().getAllThreads()
                 }
     }
+
     fun liveLocalUnreadThreadList(): Flow<List<ThreadRootEvent>> {
-        return room.getMarkedThreadNotificationsLive().asFlow()
+        return room.threadsLocalService().getMarkedThreadNotificationsLive().asFlow()
                 .startWith(room.coroutineDispatchers.io) {
-                    room.getMarkedThreadNotifications()
+                    room.threadsLocalService().getMarkedThreadNotifications()
                 }
     }
 }
diff --git a/matrix-sdk-android-flow/src/main/java/org/matrix/android/sdk/flow/FlowSession.kt b/matrix-sdk-android-flow/src/main/java/org/matrix/android/sdk/flow/FlowSession.kt
index 18753f0705..9f260858f6 100644
--- a/matrix-sdk-android-flow/src/main/java/org/matrix/android/sdk/flow/FlowSession.kt
+++ b/matrix-sdk-android-flow/src/main/java/org/matrix/android/sdk/flow/FlowSession.kt
@@ -46,16 +46,16 @@ import org.matrix.android.sdk.api.util.toOptional
 class FlowSession(private val session: Session) {
 
     fun liveRoomSummaries(queryParams: RoomSummaryQueryParams, sortOrder: RoomSortOrder = RoomSortOrder.NONE): Flow<List<RoomSummary>> {
-        return session.getRoomSummariesLive(queryParams, sortOrder).asFlow()
+        return session.roomService().getRoomSummariesLive(queryParams, sortOrder).asFlow()
                 .startWith(session.coroutineDispatchers.io) {
-                    session.getRoomSummaries(queryParams, sortOrder)
+                    session.roomService().getRoomSummaries(queryParams, sortOrder)
                 }
     }
 
     fun liveGroupSummaries(queryParams: GroupSummaryQueryParams): Flow<List<GroupSummary>> {
-        return session.getGroupSummariesLive(queryParams).asFlow()
+        return session.groupService().getGroupSummariesLive(queryParams).asFlow()
                 .startWith(session.coroutineDispatchers.io) {
-                    session.getGroupSummaries(queryParams)
+                    session.groupService().getGroupSummaries(queryParams)
                 }
     }
 
@@ -67,9 +67,9 @@ class FlowSession(private val session: Session) {
     }
 
     fun liveBreadcrumbs(queryParams: RoomSummaryQueryParams): Flow<List<RoomSummary>> {
-        return session.getBreadcrumbsLive(queryParams).asFlow()
+        return session.roomService().getBreadcrumbsLive(queryParams).asFlow()
                 .startWith(session.coroutineDispatchers.io) {
-                    session.getBreadcrumbs(queryParams)
+                    session.roomService().getBreadcrumbs(queryParams)
                 }
     }
 
@@ -85,43 +85,47 @@ class FlowSession(private val session: Session) {
     }
 
     fun livePushers(): Flow<List<Pusher>> {
-        return session.getPushersLive().asFlow()
+        return session.pushersService().getPushersLive().asFlow()
     }
 
     fun liveUser(userId: String): Flow<Optional<User>> {
-        return session.getUserLive(userId).asFlow()
+        return session.userService().getUserLive(userId).asFlow()
                 .startWith(session.coroutineDispatchers.io) {
-                    session.getUser(userId).toOptional()
+                    session.userService().getUser(userId).toOptional()
                 }
     }
 
     fun liveRoomMember(userId: String, roomId: String): Flow<Optional<RoomMemberSummary>> {
-        return session.getRoomMemberLive(userId, roomId).asFlow()
+        return session.roomService().getRoomMemberLive(userId, roomId).asFlow()
                 .startWith(session.coroutineDispatchers.io) {
-                    session.getRoomMember(userId, roomId).toOptional()
+                    session.roomService().getRoomMember(userId, roomId).toOptional()
                 }
     }
 
     fun liveUsers(): Flow<List<User>> {
-        return session.getUsersLive().asFlow()
+        return session.userService().getUsersLive().asFlow()
     }
 
     fun liveIgnoredUsers(): Flow<List<User>> {
-        return session.getIgnoredUsersLive().asFlow()
+        return session.userService().getIgnoredUsersLive().asFlow()
     }
 
     fun livePagedUsers(filter: String? = null, excludedUserIds: Set<String>? = null): Flow<PagedList<User>> {
-        return session.getPagedUsersLive(filter, excludedUserIds).asFlow()
+        return session.userService().getPagedUsersLive(filter, excludedUserIds).asFlow()
     }
 
     fun liveThreePIds(refreshData: Boolean): Flow<List<ThreePid>> {
-        return session.getThreePidsLive(refreshData).asFlow()
-                .startWith(session.coroutineDispatchers.io) { session.getThreePids() }
+        return session.profileService().getThreePidsLive(refreshData).asFlow()
+                .startWith(session.coroutineDispatchers.io) {
+                    session.profileService().getThreePids()
+                }
     }
 
     fun livePendingThreePIds(): Flow<List<ThreePid>> {
-        return session.getPendingThreePidsLive().asFlow()
-                .startWith(session.coroutineDispatchers.io) { session.getPendingThreePids() }
+        return session.profileService().getPendingThreePidsLive().asFlow()
+                .startWith(session.coroutineDispatchers.io) {
+                    session.profileService().getPendingThreePids()
+                }
     }
 
     fun liveUserCryptoDevices(userId: String): Flow<List<CryptoDeviceInfo>> {
@@ -179,7 +183,7 @@ class FlowSession(private val session: Session) {
     }
 
     fun liveRoomChangeMembershipState(): Flow<Map<String, ChangeMembershipState>> {
-        return session.getChangeMembershipsLive().asFlow()
+        return session.roomService().getChangeMembershipsLive().asFlow()
     }
 }
 
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index e9c8804bac..27041faa38 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -7,13 +7,37 @@ apply plugin: "org.jetbrains.dokka"
 
 buildscript {
     repositories {
-        mavenCentral()
+        // Do not use `mavenCentral()`, it prevents Dependabot from working properly
+        maven {
+            url 'https://repo1.maven.org/maven2'
+        }
     }
     dependencies {
         classpath "io.realm:realm-gradle-plugin:10.9.0"
     }
 }
 
+dokkaHtml {
+    dokkaSourceSets {
+        configureEach {
+            // Emit warnings about not documented members.
+            reportUndocumented.set(true)
+            // Suppress legacy Riot's packages.
+            perPackageOption {
+                matchingRegex.set("org.matrix.android.sdk.internal.legacy.riot")
+                suppress.set(true)
+            }
+            perPackageOption {
+                matchingRegex.set("org.matrix.androidsdk.crypto.data")
+                suppress.set(true)
+            }
+            // List of files with module and package documentation
+            // https://kotlinlang.org/docs/reference/kotlin-doc.html#module-and-package-documentation
+            includes.from("./docs/modules.md", "./docs/packages.md")
+        }
+    }
+}
+
 android {
     testOptions.unitTests.includeAndroidResources = true
 
@@ -32,7 +56,7 @@ android {
         // that the app's state is completely cleared between tests.
         testInstrumentationRunnerArguments clearPackageData: 'true'
 
-        buildConfigField "String", "SDK_VERSION", "\"1.4.12\""
+        buildConfigField "String", "SDK_VERSION", "\"1.4.16\""
 
         buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
         buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\""
@@ -148,7 +172,7 @@ dependencies {
     implementation libs.androidx.work
 
     // olm lib is now hosted in MavenCentral
-    implementation 'org.matrix.android:olm-sdk:3.2.10'
+    implementation 'org.matrix.android:olm-sdk:3.2.11'
 
     // DI
     implementation libs.dagger.dagger
@@ -165,7 +189,7 @@ dependencies {
     implementation libs.apache.commonsImaging
 
     // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.46'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.48'
 
     testImplementation libs.tests.junit
     // Note: version sticks to 1.9.2 due to https://github.com/mockk/mockk/issues/281
diff --git a/matrix-sdk-android/docs/modules.md b/matrix-sdk-android/docs/modules.md
new file mode 100644
index 0000000000..edf5af64d0
--- /dev/null
+++ b/matrix-sdk-android/docs/modules.md
@@ -0,0 +1,18 @@
+# Module matrix-sdk-android
+
+## Welcome to the matrix-sdk-android documentation!
+
+This pages list the complete API that this SDK is exposing to a client application.
+
+*We are still building the documentation, so everything is not documented yet.*
+
+A few entry points:
+
+- **Matrix**: The app will have to create and manage a Matrix object.
+- From this **Matrix** object, you will be able to get various services, including the **AuthenticationService**.
+- With this **AuthenticationService** you will be able to get an existing **Session**, or create one using a **LoginWizard** or a **RegistrationWizard**, which will finally give you a **Session**.
+- From the **Session**, you will be able to retrieve many Services, including the **RoomService**.
+- From the **RoomService**, you will be able to list the rooms, create a **Room**, and get a specific **Room**.
+- And from a **Room**, you will be able to do many things, including get a **Timeline**, send messages, etc.
+
+Please read the whole documentation to learn more!
diff --git a/matrix-sdk-android/docs/packages.md b/matrix-sdk-android/docs/packages.md
new file mode 100644
index 0000000000..ae7bee1b4e
--- /dev/null
+++ b/matrix-sdk-android/docs/packages.md
@@ -0,0 +1,3 @@
+# Package org.matrix.android.sdk.api
+
+This is the root package of the API exposed by this SDK.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/PermalinkParserTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/PermalinkParserTest.kt
index b11a538949..8717b3f7a8 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/PermalinkParserTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/PermalinkParserTest.kt
@@ -37,7 +37,10 @@ class PermalinkParserTest {
         Assert.assertTrue("Should be parsed as email invite but was ${parsedLink::class.java}", parsedLink is PermalinkData.RoomEmailInviteLink)
         parsedLink as PermalinkData.RoomEmailInviteLink
         Assert.assertEquals("!MRBNLPtFnMAazZVPMO:matrix.org", parsedLink.roomId)
-        Assert.assertEquals("XmOwRZnSFabCRhTywFbJWKXWVNPysOpXIbroMGaUymqkJSvHeVKRsjHajwjCYdBsvGSvHauxbKfJmOxtXldtyLnyBMLKpBQCMzyYggrdapbVIceWZBtmslOQrXLABRoe", parsedLink.token)
+        Assert.assertEquals(
+                "XmOwRZnSFabCRhTywFbJWKXWVNPysOpXIbroMGaUymqkJSvHeVKRsjHajwjCYdBsvGSvHauxbKfJmOxtXldtyLnyBMLKpBQCMzyYggrdapbVIceWZBtmslOQrXLABRoe",
+                parsedLink.token
+        )
         Assert.assertEquals("vector.im", parsedLink.identityServer)
         Assert.assertEquals("Team2", parsedLink.roomName)
         Assert.assertEquals("hiphop5", parsedLink.inviterName)
@@ -45,7 +48,8 @@ class PermalinkParserTest {
 
     @Test
     fun testParseLinkWIthEvent() {
-        val rawInvite = "https://matrix.to/#/!OGEhHVWSdvArJzumhm:matrix.org/\$xuvJUVDJnwEeVjPx029rAOZ50difpmU_5gZk_T0jGfc?via=matrix.org&via=libera.chat&via=matrix.example.io"
+        val rawInvite =
+                "https://matrix.to/#/!OGEhHVWSdvArJzumhm:matrix.org/\$xuvJUVDJnwEeVjPx029rAOZ50difpmU_5gZk_T0jGfc?via=matrix.org&via=libera.chat&via=matrix.example.io"
 
         val parsedLink = PermalinkParser.parse(rawInvite)
         Assert.assertTrue("Should be parsed as room link", parsedLink is PermalinkData.RoomLink)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/SingleThreadCoroutineDispatcher.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/SingleThreadCoroutineDispatcher.kt
index 3e3af10799..a44cd6c80f 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/SingleThreadCoroutineDispatcher.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/SingleThreadCoroutineDispatcher.kt
@@ -21,5 +21,7 @@ import kotlinx.coroutines.asCoroutineDispatcher
 import org.matrix.android.sdk.api.MatrixCoroutineDispatchers
 import java.util.concurrent.Executors
 
-internal val testCoroutineDispatchers = MatrixCoroutineDispatchers(Main, Main, Main, Main,
-        Executors.newSingleThreadExecutor().asCoroutineDispatcher())
+internal val testCoroutineDispatchers = MatrixCoroutineDispatchers(
+        Main, Main, Main, Main,
+        Executors.newSingleThreadExecutor().asCoroutineDispatcher()
+)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt
index 933074cdce..6d740c5a34 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt
@@ -46,7 +46,7 @@ class ChangePasswordTest : InstrumentedTest {
 
         // Change password
         commonTestHelper.runBlockingTest {
-            session.changePassword(TestConstants.PASSWORD, NEW_PASSWORD)
+            session.accountService().changePassword(TestConstants.PASSWORD, NEW_PASSWORD)
         }
 
         // Try to login with the previous password, it will fail
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt
index f8d108fb73..d2dfe4d945 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt
@@ -47,7 +47,7 @@ class DeactivateAccountTest : InstrumentedTest {
 
         // Deactivate the account
         commonTestHelper.runBlockingTest {
-            session.deactivateAccount(
+            session.accountService().deactivateAccount(
                     eraseAllData = false,
                     userInteractiveAuthInterceptor = object : UserInteractiveAuthInterceptor {
                         override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
@@ -67,9 +67,11 @@ class DeactivateAccountTest : InstrumentedTest {
         val throwable = commonTestHelper.logAccountWithError(session.myUserId, TestConstants.PASSWORD)
 
         // Test the error
-        assertTrue(throwable is Failure.ServerError &&
-                throwable.error.code == MatrixError.M_USER_DEACTIVATED &&
-                throwable.error.message == "This account has been deactivated")
+        assertTrue(
+                throwable is Failure.ServerError &&
+                        throwable.error.code == MatrixError.M_USER_DEACTIVATED &&
+                        throwable.error.message == "This account has been deactivated"
+        )
 
         // Try to create an account with the deactivate account user id, it will fail (M_USER_IN_USE)
         val hs = commonTestHelper.createHomeServerConfig()
@@ -95,8 +97,10 @@ class DeactivateAccountTest : InstrumentedTest {
 
         // Test the error
         accountCreationError.let {
-            assertTrue(it is Failure.ServerError &&
-                    it.error.code == MatrixError.M_USER_IN_USE)
+            assertTrue(
+                    it is Failure.ServerError &&
+                            it.error.code == MatrixError.M_USER_IN_USE
+            )
         }
 
         // No need to close the session, it has been deactivated
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
index ac4ccf56d1..4b9e605cd0 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
@@ -57,7 +57,8 @@ import java.util.concurrent.TimeUnit
 class CommonTestHelper(context: Context) {
 
     internal val matrix: TestMatrix
-    val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
+    private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
+    private var accountNumber = 0
 
     fun getTestInterceptor(session: Session): MockOkHttpInterceptor? = TestModule.interceptorForSession(session.sessionId) as? MockOkHttpInterceptor
 
@@ -145,7 +146,7 @@ class CommonTestHelper(context: Context) {
      * @param nbOfMessages the number of time the message will be sent
      */
     fun sendTextMessage(room: Room, message: String, nbOfMessages: Int, timeout: Long = TestConstants.timeOutMillis): List<TimelineEvent> {
-        val timeline = room.createTimeline(null, TimelineSettings(10))
+        val timeline = room.timelineService().createTimeline(null, TimelineSettings(10))
         timeline.start()
         val sentEvents = sendTextMessagesBatched(timeline, room, message, nbOfMessages, timeout)
         timeline.dispose()
@@ -165,11 +166,12 @@ class CommonTestHelper(context: Context) {
                 .forEach { batchedMessages ->
                     batchedMessages.forEach { formattedMessage ->
                         if (rootThreadEventId != null) {
-                            room.replyInThread(
+                            room.relationService().replyInThread(
                                     rootThreadEventId = rootThreadEventId,
-                                    replyInThreadText = formattedMessage)
+                                    replyInThreadText = formattedMessage
+                            )
                         } else {
-                            room.sendTextMessage(formattedMessage)
+                            room.sendService().sendTextMessage(formattedMessage)
                         }
                     }
                     waitWithLatch(timeout) { latch ->
@@ -214,7 +216,7 @@ class CommonTestHelper(context: Context) {
             numberOfMessages: Int,
             rootThreadEventId: String,
             timeout: Long = TestConstants.timeOutMillis): List<TimelineEvent> {
-        val timeline = room.createTimeline(null, TimelineSettings(10))
+        val timeline = room.timelineService().createTimeline(null, TimelineSettings(10))
         timeline.start()
         val sentEvents = sendTextMessagesBatched(timeline, room, message, numberOfMessages, timeout, rootThreadEventId)
         timeline.dispose()
@@ -237,7 +239,7 @@ class CommonTestHelper(context: Context) {
                               password: String,
                               testParams: SessionTestParams): Session {
         val session = createAccountAndSync(
-                userNamePrefix + "_" + System.currentTimeMillis() + UUID.randomUUID(),
+                userNamePrefix + "_" + accountNumber++ + "_" + UUID.randomUUID(),
                 password,
                 testParams
         )
@@ -431,7 +433,7 @@ class CommonTestHelper(context: Context) {
 
     fun signOutAndClose(session: Session) {
         runBlockingTest(timeout = 60_000) {
-            session.signOut(true)
+            session.signOutService().signOut(true)
         }
         // no need signout will close
         // session.close()
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
index e3ab1a4921..4ead511c4d 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
@@ -40,6 +40,7 @@ import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxStat
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
@@ -64,12 +65,12 @@ class CryptoTestHelper(private val testHelper: CommonTestHelper) {
         val aliceSession = testHelper.createAccount(TestConstants.USER_ALICE, defaultSessionParams)
 
         val roomId = testHelper.runBlockingTest {
-            aliceSession.createRoom(CreateRoomParams().apply { name = "MyRoom" })
+            aliceSession.roomService().createRoom(CreateRoomParams().apply { name = "MyRoom" })
         }
         if (encryptedRoom) {
             testHelper.waitWithLatch { latch ->
                 val room = aliceSession.getRoom(roomId)!!
-                room.enableEncryption()
+                room.roomCryptoService().enableEncryption()
                 val roomSummaryLive = room.getRoomSummaryLive()
                 val roomSummaryObserver = object : Observer<Optional<RoomSummary>> {
                     override fun onChanged(roomSummary: Optional<RoomSummary>) {
@@ -98,7 +99,7 @@ class CryptoTestHelper(private val testHelper: CommonTestHelper) {
         val bobSession = testHelper.createAccount(TestConstants.USER_BOB, defaultSessionParams)
 
         testHelper.waitWithLatch { latch ->
-            val bobRoomSummariesLive = bobSession.getRoomSummariesLive(roomSummaryQueryParams { })
+            val bobRoomSummariesLive = bobSession.roomService().getRoomSummariesLive(roomSummaryQueryParams { })
             val newRoomObserver = object : Observer<List<RoomSummary>> {
                 override fun onChanged(t: List<RoomSummary>?) {
                     if (t?.isNotEmpty() == true) {
@@ -108,14 +109,15 @@ class CryptoTestHelper(private val testHelper: CommonTestHelper) {
                 }
             }
             bobRoomSummariesLive.observeForever(newRoomObserver)
-            aliceRoom.invite(bobSession.myUserId)
+            aliceRoom.membershipService().invite(bobSession.myUserId)
         }
 
         testHelper.waitWithLatch { latch ->
-            val bobRoomSummariesLive = bobSession.getRoomSummariesLive(roomSummaryQueryParams { })
+            val bobRoomSummariesLive = bobSession.roomService().getRoomSummariesLive(roomSummaryQueryParams { })
             val roomJoinedObserver = object : Observer<List<RoomSummary>> {
                 override fun onChanged(t: List<RoomSummary>?) {
                     if (bobSession.getRoom(aliceRoomId)
+                                    ?.membershipService()
                                     ?.getRoomMember(bobSession.myUserId)
                                     ?.membership == Membership.JOIN) {
                         bobRoomSummariesLive.removeObserver(this)
@@ -124,7 +126,7 @@ class CryptoTestHelper(private val testHelper: CommonTestHelper) {
                 }
             }
             bobRoomSummariesLive.observeForever(roomJoinedObserver)
-            bobSession.joinRoom(aliceRoomId)
+            bobSession.roomService().joinRoom(aliceRoomId)
         }
         // Ensure bob can send messages to the room
 //        val roomFromBobPOV = bobSession.getRoom(aliceRoomId)!!
@@ -160,11 +162,11 @@ class CryptoTestHelper(private val testHelper: CommonTestHelper) {
         val samSession = testHelper.createAccount(TestConstants.USER_SAM, defaultSessionParams)
 
         testHelper.runBlockingTest {
-            room.invite(samSession.myUserId, null)
+            room.membershipService().invite(samSession.myUserId, null)
         }
 
         testHelper.runBlockingTest {
-            samSession.joinRoom(room.roomId, null, emptyList())
+            samSession.roomService().joinRoom(room.roomId, null, emptyList())
         }
 
         return samSession
@@ -242,8 +244,8 @@ class CryptoTestHelper(private val testHelper: CommonTestHelper) {
     fun createDM(alice: Session, bob: Session): String {
         var roomId: String = ""
         testHelper.waitWithLatch { latch ->
-            roomId = alice.createDirectRoom(bob.myUserId)
-            val bobRoomSummariesLive = bob.getRoomSummariesLive(roomSummaryQueryParams { })
+            roomId = alice.roomService().createDirectRoom(bob.myUserId)
+            val bobRoomSummariesLive = bob.roomService().getRoomSummariesLive(roomSummaryQueryParams { })
             val newRoomObserver = object : Observer<List<RoomSummary>> {
                 override fun onChanged(t: List<RoomSummary>?) {
                     if (t?.any { it.roomId == roomId }.orFalse()) {
@@ -256,10 +258,11 @@ class CryptoTestHelper(private val testHelper: CommonTestHelper) {
         }
 
         testHelper.waitWithLatch { latch ->
-            val bobRoomSummariesLive = bob.getRoomSummariesLive(roomSummaryQueryParams { })
+            val bobRoomSummariesLive = bob.roomService().getRoomSummariesLive(roomSummaryQueryParams { })
             val newRoomObserver = object : Observer<List<RoomSummary>> {
                 override fun onChanged(t: List<RoomSummary>?) {
                     if (bob.getRoom(roomId)
+                                    ?.membershipService()
                                     ?.getRoomMember(bob.myUserId)
                                     ?.membership == Membership.JOIN) {
                         bobRoomSummariesLive.removeObserver(this)
@@ -268,7 +271,7 @@ class CryptoTestHelper(private val testHelper: CommonTestHelper) {
                 }
             }
             bobRoomSummariesLive.observeForever(newRoomObserver)
-            bob.joinRoom(roomId)
+            bob.roomService().joinRoom(roomId)
         }
 
         return roomId
@@ -288,7 +291,8 @@ class CryptoTestHelper(private val testHelper: CommonTestHelper) {
                                             )
                                     )
                                 }
-                            }, it)
+                            }, it
+                    )
         }
     }
 
@@ -305,7 +309,8 @@ class CryptoTestHelper(private val testHelper: CommonTestHelper) {
                 requestID,
                 roomId,
                 bob.myUserId,
-                bob.sessionParams.credentials.deviceId!!)
+                bob.sessionParams.credentials.deviceId!!
+        )
 
         // we should reach SHOW SAS on both
         var alicePovTx: OutgoingSasVerificationTransaction? = null
@@ -367,20 +372,20 @@ class CryptoTestHelper(private val testHelper: CommonTestHelper) {
         aliceSession.cryptoService().setWarnOnUnknownDevices(false)
 
         val roomId = testHelper.runBlockingTest {
-            aliceSession.createRoom(CreateRoomParams().apply { name = "MyRoom" })
+            aliceSession.roomService().createRoom(CreateRoomParams().apply { name = "MyRoom" })
         }
         val room = aliceSession.getRoom(roomId)!!
 
         testHelper.runBlockingTest {
-            room.enableEncryption()
+            room.roomCryptoService().enableEncryption()
         }
 
         val sessions = mutableListOf(aliceSession)
         for (index in 1 until numberOfMembers) {
             val session = testHelper.createAccount("User_$index", defaultSessionParams)
-            testHelper.runBlockingTest(timeout = 600_000) { room.invite(session.myUserId, null) }
+            testHelper.runBlockingTest(timeout = 600_000) { room.membershipService().invite(session.myUserId, null) }
             println("TEST -> " + session.myUserId + " invited")
-            testHelper.runBlockingTest { session.joinRoom(room.roomId, null, emptyList()) }
+            testHelper.runBlockingTest { session.roomService().joinRoom(room.roomId, null, emptyList()) }
             println("TEST -> " + session.myUserId + " joined")
             sessions.add(session)
         }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt
index dc58339498..525e168cf1 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt
@@ -29,15 +29,17 @@ import org.matrix.android.sdk.internal.raw.RawModule
 import org.matrix.android.sdk.internal.settings.SettingsModule
 import org.matrix.android.sdk.internal.util.system.SystemModule
 
-@Component(modules = [
-    TestModule::class,
-    MatrixModule::class,
-    NetworkModule::class,
-    AuthModule::class,
-    RawModule::class,
-    SettingsModule::class,
-    SystemModule::class
-])
+@Component(
+        modules = [
+            TestModule::class,
+            MatrixModule::class,
+            NetworkModule::class,
+            AuthModule::class,
+            RawModule::class,
+            SettingsModule::class,
+            SystemModule::class
+        ]
+)
 @MatrixScope
 internal interface TestMatrixComponent : MatrixComponent {
 
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/AttachmentEncryptionTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/AttachmentEncryptionTest.kt
index 732f4f7dce..f5f585a1e0 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/AttachmentEncryptionTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/AttachmentEncryptionTest.kt
@@ -29,8 +29,10 @@ import org.matrix.android.sdk.api.session.crypto.attachments.toElementToDecrypt
 import org.matrix.android.sdk.api.session.crypto.model.EncryptedFileInfo
 import org.matrix.android.sdk.api.session.crypto.model.EncryptedFileKey
 import org.matrix.android.sdk.internal.crypto.attachments.MXEncryptedAttachments
+import org.matrix.android.sdk.internal.util.time.DefaultClock
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
+import java.util.UUID
 
 /**
  * Unit tests AttachmentEncryptionTest.
@@ -48,13 +50,18 @@ class AttachmentEncryptionTest {
         inputStream = if (inputAsByteArray.isEmpty()) {
             inputAsByteArray.inputStream()
         } else {
-            val memoryFile = MemoryFile("file" + System.currentTimeMillis(), inputAsByteArray.size)
+            val memoryFile = MemoryFile("file_" + UUID.randomUUID(), inputAsByteArray.size)
             memoryFile.outputStream.write(inputAsByteArray)
             memoryFile.inputStream
         }
 
         val decryptedStream = ByteArrayOutputStream()
-        val result = MXEncryptedAttachments.decryptAttachment(inputStream, encryptedFileInfo.toElementToDecrypt()!!, decryptedStream)
+        val result = MXEncryptedAttachments.decryptAttachment(
+                attachmentStream = inputStream,
+                elementToDecrypt = encryptedFileInfo.toElementToDecrypt()!!,
+                outputStream = decryptedStream,
+                clock = DefaultClock()
+        )
 
         assert(result)
 
@@ -117,9 +124,13 @@ class AttachmentEncryptionTest {
                 url = "dummyUrl"
         )
 
-        assertEquals("YWxwaGFudW1lcmljYWxseWFscGhhbnVtZXJpY2FsbHlhbHBoYW51bWVyaWNhbGx5YWxwaGFudW1lcmljYWxseQ",
-                checkDecryption("zhtFStAeFx0s+9L/sSQO+WQMtldqYEHqTxMduJrCIpnkyer09kxJJuA4K+adQE4w+7jZe/vR9kIcqj9rOhDR8Q",
-                        encryptedFileInfo))
+        assertEquals(
+                "YWxwaGFudW1lcmljYWxseWFscGhhbnVtZXJpY2FsbHlhbHBoYW51bWVyaWNhbGx5YWxwaGFudW1lcmljYWxseQ",
+                checkDecryption(
+                        "zhtFStAeFx0s+9L/sSQO+WQMtldqYEHqTxMduJrCIpnkyer09kxJJuA4K+adQE4w+7jZe/vR9kIcqj9rOhDR8Q",
+                        encryptedFileInfo
+                )
+        )
     }
 
     @Test
@@ -138,8 +149,12 @@ class AttachmentEncryptionTest {
                 url = "dummyUrl"
         )
 
-        assertNotEquals("YWxwaGFudW1lcmljYWxseWFscGhhbnVtZXJpY2FsbHlhbHBoYW51bWVyaWNhbGx5YWxwaGFudW1lcmljYWxseQ",
-                checkDecryption("tJVNBVJ/vl36UQt4Y5e5m84bRUrQHhcdLPvS/7EkDvlkDLZXamBB6k8THbiawiKZ5Mnq9PZMSSbgOCvmnUBOMA",
-                        encryptedFileInfo))
+        assertNotEquals(
+                "YWxwaGFudW1lcmljYWxseWFscGhhbnVtZXJpY2FsbHlhbHBoYW51bWVyaWNhbGx5YWxwaGFudW1lcmljYWxseQ",
+                checkDecryption(
+                        "tJVNBVJ/vl36UQt4Y5e5m84bRUrQHhcdLPvS/7EkDvlkDLZXamBB6k8THbiawiKZ5Mnq9PZMSSbgOCvmnUBOMA",
+                        encryptedFileInfo
+                )
+        )
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreHelper.kt
index c717c8e33f..ba1afd4758 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreHelper.kt
@@ -22,6 +22,7 @@ import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStore
 import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStoreModule
 import org.matrix.android.sdk.internal.crypto.store.db.mapper.CrossSigningKeysMapper
 import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.util.time.DefaultClock
 import kotlin.random.Random
 
 internal class CryptoStoreHelper {
@@ -34,7 +35,8 @@ internal class CryptoStoreHelper {
                         .build(),
                 crossSigningKeysMapper = CrossSigningKeysMapper(MoshiProvider.providesMoshi()),
                 userId = "userId_" + Random.nextInt(),
-                deviceId = "deviceId_sample"
+                deviceId = "deviceId_sample",
+                clock = DefaultClock(),
         )
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
index f43c425cc9..e823aa39a1 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
@@ -27,6 +27,7 @@ import org.junit.runner.RunWith
 import org.matrix.android.sdk.InstrumentedTest
 import org.matrix.android.sdk.internal.crypto.model.OlmSessionWrapper
 import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.util.time.DefaultClock
 import org.matrix.olm.OlmAccount
 import org.matrix.olm.OlmManager
 import org.matrix.olm.OlmSession
@@ -37,6 +38,7 @@ private const val DUMMY_DEVICE_KEY = "DeviceKey"
 class CryptoStoreTest : InstrumentedTest {
 
     private val cryptoStoreHelper = CryptoStoreHelper()
+    private val clock = DefaultClock()
 
     @Before
     fun setup() {
@@ -74,9 +76,11 @@ class CryptoStoreTest : InstrumentedTest {
         }
 
         val olmSession1 = OlmSession().apply {
-            initOutboundSession(olmAccount1,
+            initOutboundSession(
+                    olmAccount1,
                     olmAccount1.identityKeys()[OlmAccount.JSON_KEY_IDENTITY_KEY],
-                    olmAccount1.oneTimeKeys()[OlmAccount.JSON_KEY_ONE_TIME_KEY]?.values?.first())
+                    olmAccount1.oneTimeKeys()[OlmAccount.JSON_KEY_ONE_TIME_KEY]?.values?.first()
+            )
         }
 
         val sessionId1 = olmSession1.sessionIdentifier()
@@ -91,9 +95,11 @@ class CryptoStoreTest : InstrumentedTest {
         }
 
         val olmSession2 = OlmSession().apply {
-            initOutboundSession(olmAccount2,
+            initOutboundSession(
+                    olmAccount2,
                     olmAccount2.identityKeys()[OlmAccount.JSON_KEY_IDENTITY_KEY],
-                    olmAccount2.oneTimeKeys()[OlmAccount.JSON_KEY_ONE_TIME_KEY]?.values?.first())
+                    olmAccount2.oneTimeKeys()[OlmAccount.JSON_KEY_ONE_TIME_KEY]?.values?.first()
+            )
         }
 
         val sessionId2 = olmSession2.sessionIdentifier()
@@ -106,7 +112,7 @@ class CryptoStoreTest : InstrumentedTest {
 
         // Note: we cannot be sure what will be the result of getLastUsedSessionId() here
 
-        olmSessionWrapper2.onMessageReceived()
+        olmSessionWrapper2.onMessageReceived(clock.epochMillis())
         cryptoStore.storeSession(olmSessionWrapper2, DUMMY_DEVICE_KEY)
 
         // sessionId2 is returned now
@@ -114,7 +120,7 @@ class CryptoStoreTest : InstrumentedTest {
 
         Thread.sleep(2)
 
-        olmSessionWrapper1.onMessageReceived()
+        olmSessionWrapper1.onMessageReceived(clock.epochMillis())
         cryptoStore.storeSession(olmSessionWrapper1, DUMMY_DEVICE_KEY)
 
         // sessionId1 is returned now
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
index 3884683151..ed922fdddc 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
@@ -38,8 +38,11 @@ import org.matrix.android.sdk.api.session.crypto.model.OlmDecryptionResult
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.content.EncryptedEventContent
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.failure.JoinRoomFailure
+import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.send.SendState
@@ -86,7 +89,7 @@ class E2eeSanityTests : InstrumentedTest {
         otherAccounts.forEach {
             testHelper.runBlockingTest {
                 Log.v("#E2E TEST", "Alice invites ${it.myUserId}")
-                aliceRoomPOV.invite(it.myUserId)
+                aliceRoomPOV.membershipService().invite(it.myUserId)
             }
         }
 
@@ -128,7 +131,7 @@ class E2eeSanityTests : InstrumentedTest {
         newAccount.forEach {
             testHelper.runBlockingTest {
                 Log.v("#E2E TEST", "Alice invites ${it.myUserId}")
-                aliceRoomPOV.invite(it.myUserId)
+                aliceRoomPOV.membershipService().invite(it.myUserId)
             }
         }
 
@@ -296,11 +299,13 @@ class E2eeSanityTests : InstrumentedTest {
             }
 
             val importedResult = testHelper.doSync<ImportRoomKeysResult> {
-                keysBackupService.restoreKeyBackupWithPassword(keyVersionResult!!,
+                keysBackupService.restoreKeyBackupWithPassword(
+                        keyVersionResult!!,
                         keyBackupPassword,
                         null,
                         null,
-                        null, it)
+                        null, it
+                )
             }
 
             assertEquals(3, importedResult.totalNumberOfKeys)
@@ -523,10 +528,10 @@ class E2eeSanityTests : InstrumentedTest {
     }
 
     private fun sendMessageInRoom(aliceRoomPOV: Room, text: String): String? {
-        aliceRoomPOV.sendTextMessage(text)
+        aliceRoomPOV.sendService().sendTextMessage(text)
         var sentEventId: String? = null
         testHelper.waitWithLatch(4 * TestConstants.timeOutMillis) { latch ->
-            val timeline = aliceRoomPOV.createTimeline(null, TimelineSettings(60))
+            val timeline = aliceRoomPOV.timelineService().createTimeline(null, TimelineSettings(60))
             timeline.start()
 
             testHelper.retryPeriodicallyWithLatch(latch) {
@@ -551,7 +556,7 @@ class E2eeSanityTests : InstrumentedTest {
         testHelper.waitWithLatch { latch ->
             testHelper.retryPeriodicallyWithLatch(latch) {
                 otherAccounts.map {
-                    aliceSession.getRoomMember(it.myUserId, e2eRoomID)?.membership
+                    aliceSession.roomService().getRoomMember(it.myUserId, e2eRoomID)?.membership
                 }.all {
                     it == Membership.JOIN
                 }
@@ -574,7 +579,7 @@ class E2eeSanityTests : InstrumentedTest {
         testHelper.runBlockingTest(60_000) {
             Log.v("#E2E TEST", "${otherSession.myUserId} tries to join room $e2eRoomID")
             try {
-                otherSession.joinRoom(e2eRoomID)
+                otherSession.roomService().joinRoom(e2eRoomID)
             } catch (ex: JoinRoomFailure.JoinedWithTimeout) {
                 // it's ok we will wait after
             }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ExportEncryptionTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ExportEncryptionTest.kt
index 17664c78aa..c2d8f4fb35 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ExportEncryptionTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ExportEncryptionTest.kt
@@ -93,9 +93,11 @@ class ExportEncryptionTest {
             fail("## checkExportDecrypt1() failed : " + e.message)
         }
 
-        assertEquals("## checkExportDecrypt1() : expectedString $expectedString -- decodedString $decodedString",
+        assertEquals(
+                "## checkExportDecrypt1() : expectedString $expectedString -- decodedString $decodedString",
                 expectedString,
-                decodedString)
+                decodedString
+        )
     }
 
     @Test
@@ -111,9 +113,11 @@ class ExportEncryptionTest {
             fail("## checkExportDecrypt2() failed : " + e.message)
         }
 
-        assertEquals("## checkExportDecrypt2() : expectedString $expectedString -- decodedString $decodedString",
+        assertEquals(
+                "## checkExportDecrypt2() : expectedString $expectedString -- decodedString $decodedString",
                 expectedString,
-                decodedString)
+                decodedString
+        )
     }
 
     @Test
@@ -129,9 +133,11 @@ class ExportEncryptionTest {
             fail("## checkExportDecrypt3() failed : " + e.message)
         }
 
-        assertEquals("## checkExportDecrypt3() : expectedString $expectedString -- decodedString $decodedString",
+        assertEquals(
+                "## checkExportDecrypt3() : expectedString $expectedString -- decodedString $decodedString",
                 expectedString,
-                decodedString)
+                decodedString
+        )
     }
 
     @Test
@@ -147,9 +153,11 @@ class ExportEncryptionTest {
             fail("## checkExportEncrypt1() failed : " + e.message)
         }
 
-        assertEquals("## checkExportEncrypt1() : expectedString $expectedString -- decodedString $decodedString",
+        assertEquals(
+                "## checkExportEncrypt1() : expectedString $expectedString -- decodedString $decodedString",
                 expectedString,
-                decodedString)
+                decodedString
+        )
     }
 
     @Test
@@ -165,9 +173,11 @@ class ExportEncryptionTest {
             fail("## checkExportEncrypt2() failed : " + e.message)
         }
 
-        assertEquals("## checkExportEncrypt2() : expectedString $expectedString -- decodedString $decodedString",
+        assertEquals(
+                "## checkExportEncrypt2() : expectedString $expectedString -- decodedString $decodedString",
                 expectedString,
-                decodedString)
+                decodedString
+        )
     }
 
     @Test
@@ -183,9 +193,11 @@ class ExportEncryptionTest {
             fail("## checkExportEncrypt3() failed : " + e.message)
         }
 
-        assertEquals("## checkExportEncrypt3() : expectedString $expectedString -- decodedString $decodedString",
+        assertEquals(
+                "## checkExportEncrypt3() : expectedString $expectedString -- decodedString $decodedString",
                 expectedString,
-                decodedString)
+                decodedString
+        )
     }
 
     @Test
@@ -201,8 +213,10 @@ class ExportEncryptionTest {
             fail("## checkExportEncrypt4() failed : " + e.message)
         }
 
-        assertEquals("## checkExportEncrypt4() : expectedString $expectedString -- decodedString $decodedString",
+        assertEquals(
+                "## checkExportEncrypt4() : expectedString $expectedString -- decodedString $decodedString",
                 expectedString,
-                decodedString)
+                decodedString
+        )
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt
index aa9f09314f..8a1edec5e3 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt
@@ -29,6 +29,8 @@ import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.content.EncryptedEventContent
 import org.matrix.android.sdk.api.session.events.model.content.RoomKeyContent
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.common.CommonTestHelper
 import org.matrix.android.sdk.common.CryptoTestHelper
 
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
index 8346430530..0f3a4b4181 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
@@ -34,6 +34,7 @@ import org.matrix.android.sdk.api.session.crypto.MXCryptoError
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.content.EncryptedEventContent
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
@@ -97,7 +98,7 @@ class UnwedgingTest : InstrumentedTest {
         val roomFromBobPOV = bobSession.getRoom(aliceRoomId)!!
         val roomFromAlicePOV = aliceSession.getRoom(aliceRoomId)!!
 
-        val bobTimeline = roomFromBobPOV.createTimeline(null, TimelineSettings(20))
+        val bobTimeline = roomFromBobPOV.timelineService().createTimeline(null, TimelineSettings(20))
         bobTimeline.start()
 
         val bobFinalLatch = CountDownLatch(1)
@@ -128,7 +129,7 @@ class UnwedgingTest : InstrumentedTest {
         messagesReceivedByBob = emptyList()
 
         // - Alice sends a 1st message with a 1st megolm session
-        roomFromAlicePOV.sendTextMessage("First message")
+        roomFromAlicePOV.sendService().sendTextMessage("First message")
 
         // Wait for the message to be received by Bob
         testHelper.await(latch)
@@ -156,7 +157,7 @@ class UnwedgingTest : InstrumentedTest {
 
         Timber.i("## CRYPTO | testUnwedging:  Alice sends a 2nd message with a 2nd megolm session")
         // - Alice sends a 2nd message with a 2nd megolm session
-        roomFromAlicePOV.sendTextMessage("Second message")
+        roomFromAlicePOV.sendService().sendTextMessage("Second message")
 
         // Wait for the message to be received by Bob
         testHelper.await(latch)
@@ -170,7 +171,10 @@ class UnwedgingTest : InstrumentedTest {
         // Let us wedge the session now. Set crypto state like after the first message
         Timber.i("## CRYPTO | testUnwedging: wedge the session now. Set crypto state like after the first message")
 
-        aliceCryptoStore.storeSession(OlmSessionWrapper(deserializeFromRealm<OlmSession>(oldSession)!!), bobSession.cryptoService().getMyDevice().identityKey()!!)
+        aliceCryptoStore.storeSession(
+                OlmSessionWrapper(deserializeFromRealm<OlmSession>(oldSession)!!),
+                bobSession.cryptoService().getMyDevice().identityKey()!!
+        )
         olmDevice.clearOlmSessionCache()
         Thread.sleep(6_000)
 
@@ -185,7 +189,7 @@ class UnwedgingTest : InstrumentedTest {
 
             Timber.i("## CRYPTO | testUnwedging: Alice sends a 3rd message with a 3rd megolm session but a wedged olm session")
             // - Alice sends a 3rd message with a 3rd megolm session but a wedged olm session
-            roomFromAlicePOV.sendTextMessage("Third message")
+            roomFromAlicePOV.sendService().sendTextMessage("Third message")
             // Bob should not be able to decrypt, because the session key could not be sent
         }
         bobTimeline.removeListener(bobEventsListener)
@@ -217,7 +221,8 @@ class UnwedgingTest : InstrumentedTest {
                                             )
                                     )
                                 }
-                            }, it)
+                            }, it
+                    )
         }
 
         // Wait until we received back the key
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
index dc65cec187..a37626dc20 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
@@ -110,11 +110,13 @@ class XSigningTest : InstrumentedTest {
                 }
             }, it)
         }
-        testHelper.doSync<Unit> { bobSession.cryptoService().crossSigningService().initializeCrossSigning(object : UserInteractiveAuthInterceptor {
-            override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
-                promise.resume(bobAuthParams)
-            }
-        }, it) }
+        testHelper.doSync<Unit> {
+            bobSession.cryptoService().crossSigningService().initializeCrossSigning(object : UserInteractiveAuthInterceptor {
+                override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
+                    promise.resume(bobAuthParams)
+                }
+            }, it)
+        }
 
         // Check that alice can see bob keys
         testHelper.doSync<MXUsersDevicesMap<CryptoDeviceInfo>> { aliceSession.cryptoService().downloadKeys(listOf(bobSession.myUserId), true, it) }
@@ -124,8 +126,16 @@ class XSigningTest : InstrumentedTest {
         assertNull("Alice should not see bob User key", bobKeysFromAlicePOV.userKey())
         assertNotNull("Alice can see bob SelfSigned key", bobKeysFromAlicePOV.selfSigningKey())
 
-        assertEquals("Bob keys from alice pov should match", bobKeysFromAlicePOV.masterKey()?.unpaddedBase64PublicKey, bobSession.cryptoService().crossSigningService().getMyCrossSigningKeys()?.masterKey()?.unpaddedBase64PublicKey)
-        assertEquals("Bob keys from alice pov should match", bobKeysFromAlicePOV.selfSigningKey()?.unpaddedBase64PublicKey, bobSession.cryptoService().crossSigningService().getMyCrossSigningKeys()?.selfSigningKey()?.unpaddedBase64PublicKey)
+        assertEquals(
+                "Bob keys from alice pov should match",
+                bobKeysFromAlicePOV.masterKey()?.unpaddedBase64PublicKey,
+                bobSession.cryptoService().crossSigningService().getMyCrossSigningKeys()?.masterKey()?.unpaddedBase64PublicKey
+        )
+        assertEquals(
+                "Bob keys from alice pov should match",
+                bobKeysFromAlicePOV.selfSigningKey()?.unpaddedBase64PublicKey,
+                bobSession.cryptoService().crossSigningService().getMyCrossSigningKeys()?.selfSigningKey()?.unpaddedBase64PublicKey
+        )
 
         assertFalse("Bob keys from alice pov should not be trusted", bobKeysFromAlicePOV.isTrusted())
 
@@ -149,16 +159,20 @@ class XSigningTest : InstrumentedTest {
                 password = TestConstants.PASSWORD
         )
 
-        testHelper.doSync<Unit> { aliceSession.cryptoService().crossSigningService().initializeCrossSigning(object : UserInteractiveAuthInterceptor {
-            override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
-                promise.resume(aliceAuthParams)
-            }
-        }, it) }
-        testHelper.doSync<Unit> { bobSession.cryptoService().crossSigningService().initializeCrossSigning(object : UserInteractiveAuthInterceptor {
-            override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
-                promise.resume(bobAuthParams)
-            }
-        }, it) }
+        testHelper.doSync<Unit> {
+            aliceSession.cryptoService().crossSigningService().initializeCrossSigning(object : UserInteractiveAuthInterceptor {
+                override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
+                    promise.resume(aliceAuthParams)
+                }
+            }, it)
+        }
+        testHelper.doSync<Unit> {
+            bobSession.cryptoService().crossSigningService().initializeCrossSigning(object : UserInteractiveAuthInterceptor {
+                override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
+                    promise.resume(bobAuthParams)
+                }
+            }, it)
+        }
 
         // Check that alice can see bob keys
         val bobUserId = bobSession.myUserId
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt
index 84c9487e03..85b6c21df3 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt
@@ -28,6 +28,7 @@ import org.matrix.android.sdk.api.crypto.MXCRYPTO_ALGORITHM_MEGOLM
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.content.EncryptionEventContent
 import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
@@ -48,7 +49,7 @@ class EncryptionTest : InstrumentedTest {
     fun test_EncryptionEvent() {
         performTest(roomShouldBeEncrypted = false) { room ->
             // Send an encryption Event as an Event (and not as a state event)
-            room.sendEvent(
+            room.sendService().sendEvent(
                     eventType = EventType.STATE_ROOM_ENCRYPTION,
                     content = EncryptionEventContent(algorithm = MXCRYPTO_ALGORITHM_MEGOLM).toContent()
             )
@@ -60,7 +61,7 @@ class EncryptionTest : InstrumentedTest {
         performTest(roomShouldBeEncrypted = true) { room ->
             runBlocking {
                 // Send an encryption Event as a State Event
-                room.sendStateEvent(
+                room.stateService().sendStateEvent(
                         eventType = EventType.STATE_ROOM_ENCRYPTION,
                         stateKey = "",
                         body = EncryptionEventContent(algorithm = MXCRYPTO_ALGORITHM_MEGOLM).toContent()
@@ -75,9 +76,9 @@ class EncryptionTest : InstrumentedTest {
         val aliceSession = cryptoTestData.firstSession
         val room = aliceSession.getRoom(cryptoTestData.roomId)!!
 
-        room.isEncrypted() shouldBe false
+        room.roomCryptoService().isEncrypted() shouldBe false
 
-        val timeline = room.createTimeline(null, TimelineSettings(10))
+        val timeline = room.timelineService().createTimeline(null, TimelineSettings(10))
         val latch = CountDownLatch(1)
         val timelineListener = object : Timeline.Listener {
             override fun onTimelineFailure(throwable: Throwable) {
@@ -105,7 +106,7 @@ class EncryptionTest : InstrumentedTest {
         testHelper.await(latch)
         timeline.dispose()
         testHelper.waitWithLatch {
-            room.isEncrypted() shouldBe roomShouldBeEncrypted
+            room.roomCryptoService().isEncrypted() shouldBe roomShouldBeEncrypted
             it.countDown()
         }
         cryptoTestData.cleanUp(testHelper)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
index 5e271c6910..5066a4339f 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
@@ -50,6 +50,8 @@ import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransa
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
 import org.matrix.android.sdk.api.session.events.model.content.EncryptedEventContent
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
@@ -73,7 +75,7 @@ class KeyShareTests : InstrumentedTest {
 
         // Create an encrypted room and add a message
         val roomId = commonTestHelper.runBlockingTest {
-            aliceSession.createRoom(
+            aliceSession.roomService().createRoom(
                     CreateRoomParams().apply {
                         visibility = RoomDirectoryVisibility.PRIVATE
                         enableEncryption()
@@ -83,7 +85,7 @@ class KeyShareTests : InstrumentedTest {
         val room = aliceSession.getRoom(roomId)
         assertNotNull(room)
         Thread.sleep(4_000)
-        assertTrue(room?.isEncrypted() == true)
+        assertTrue(room?.roomCryptoService()?.isEncrypted() == true)
         val sentEventId = commonTestHelper.sendTextMessage(room!!, "My Message", 1).first().eventId
 
         // Open a new sessionx
@@ -143,7 +145,10 @@ class KeyShareTests : InstrumentedTest {
                     Log.v("TEST", "Incoming request Session 1 (looking for $outGoingRequestId)")
                     Log.v("TEST", "=========================")
                     it.forEach { keyRequest ->
-                        Log.v("TEST", "[ts${keyRequest.localCreationTimestamp}] requestId ${keyRequest.requestId}, for sessionId ${keyRequest.requestBody?.sessionId} is ${keyRequest.state}")
+                        Log.v(
+                                "TEST",
+                                "[ts${keyRequest.localCreationTimestamp}] requestId ${keyRequest.requestId}, for sessionId ${keyRequest.requestBody?.sessionId} is ${keyRequest.state}"
+                        )
                     }
                     Log.v("TEST", "=========================")
                 }
@@ -162,8 +167,10 @@ class KeyShareTests : InstrumentedTest {
         }
 
         // Mark the device as trusted
-        aliceSession.cryptoService().setDeviceVerification(DeviceTrustLevel(crossSigningVerified = false, locallyVerified = true), aliceSession.myUserId,
-                aliceSession2.sessionParams.deviceId ?: "")
+        aliceSession.cryptoService().setDeviceVerification(
+                DeviceTrustLevel(crossSigningVerified = false, locallyVerified = true), aliceSession.myUserId,
+                aliceSession2.sessionParams.deviceId ?: ""
+        )
 
         // Re request
         aliceSession2.cryptoService().reRequestRoomKeyForEvent(receivedEvent.root)
@@ -221,7 +228,8 @@ class KeyShareTests : InstrumentedTest {
                                             )
                                     )
                                 }
-                            }, it)
+                            }, it
+                    )
         }
 
         // Also bootstrap keybackup on first session
@@ -280,8 +288,10 @@ class KeyShareTests : InstrumentedTest {
         })
 
         val txId = "m.testVerif12"
-        aliceVerificationService2.beginKeyVerification(VerificationMethod.SAS, aliceSession1.myUserId, aliceSession1.sessionParams.deviceId
-                ?: "", txId)
+        aliceVerificationService2.beginKeyVerification(
+                VerificationMethod.SAS, aliceSession1.myUserId, aliceSession1.sessionParams.deviceId
+                ?: "", txId
+        )
 
         commonTestHelper.waitWithLatch { latch ->
             commonTestHelper.retryPeriodicallyWithLatch(latch) {
@@ -335,12 +345,13 @@ class KeyShareTests : InstrumentedTest {
                                             )
                                     )
                                 }
-                            }, it)
+                            }, it
+                    )
         }
 
         // Create an encrypted room and send a couple of messages
         val roomId = commonTestHelper.runBlockingTest {
-            aliceSession.createRoom(
+            aliceSession.roomService().createRoom(
                     CreateRoomParams().apply {
                         visibility = RoomDirectoryVisibility.PRIVATE
                         enableEncryption()
@@ -350,7 +361,7 @@ class KeyShareTests : InstrumentedTest {
         val roomAlicePov = aliceSession.getRoom(roomId)
         assertNotNull(roomAlicePov)
         Thread.sleep(1_000)
-        assertTrue(roomAlicePov?.isEncrypted() == true)
+        assertTrue(roomAlicePov?.roomCryptoService()?.isEncrypted() == true)
         val secondEventId = commonTestHelper.sendTextMessage(roomAlicePov!!, "Message", 3)[1].eventId
 
         // Create bob session
@@ -369,16 +380,17 @@ class KeyShareTests : InstrumentedTest {
                                             )
                                     )
                                 }
-                            }, it)
+                            }, it
+                    )
         }
 
         // Let alice invite bob
         commonTestHelper.runBlockingTest {
-            roomAlicePov.invite(bobSession.myUserId, null)
+            roomAlicePov.membershipService().invite(bobSession.myUserId, null)
         }
 
         commonTestHelper.runBlockingTest {
-            bobSession.joinRoom(roomAlicePov.roomId, null, emptyList())
+            bobSession.roomService().joinRoom(roomAlicePov.roomId, null, emptyList())
         }
 
         // we want to discard alice outbound session
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
index 55bb03278c..b3896b02de 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
@@ -33,6 +33,8 @@ import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.content.EncryptedEventContent
 import org.matrix.android.sdk.api.session.events.model.content.WithHeldCode
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.common.CommonTestHelper
 import org.matrix.android.sdk.common.CryptoTestHelper
 import org.matrix.android.sdk.common.MockOkHttpInterceptor
@@ -145,13 +147,15 @@ class WithHeldTests : InstrumentedTest {
         val aliceInterceptor = testHelper.getTestInterceptor(aliceSession)
 
         // Simulate no OTK
-        aliceInterceptor!!.addRule(MockOkHttpInterceptor.SimpleRule(
-                "/keys/claim",
-                200,
-                """
+        aliceInterceptor!!.addRule(
+                MockOkHttpInterceptor.SimpleRule(
+                        "/keys/claim",
+                        200,
+                        """
                    { "one_time_keys" : {} } 
                 """
-        ))
+                )
+        )
         Log.d("#TEST", "Recovery :${aliceSession.sessionParams.credentials.accessToken}")
 
         val roomAlicePov = aliceSession.getRoom(testData.roomId)!!
@@ -182,7 +186,10 @@ class WithHeldTests : InstrumentedTest {
 
         // Ensure that alice has marked the session to be shared with bob
         val sessionId = eventBobPOV!!.root.content.toModel<EncryptedEventContent>()!!.sessionId!!
-        val chainIndex = aliceSession.cryptoService().getSharedWithInfo(testData.roomId, sessionId).getObject(bobSession.myUserId, bobSession.sessionParams.credentials.deviceId)
+        val chainIndex = aliceSession.cryptoService().getSharedWithInfo(testData.roomId, sessionId).getObject(
+                bobSession.myUserId,
+                bobSession.sessionParams.credentials.deviceId
+        )
 
         Assert.assertEquals("Alice should have marked bob's device for this session", 0, chainIndex)
         // Add a new device for bob
@@ -200,7 +207,10 @@ class WithHeldTests : InstrumentedTest {
             }
         }
 
-        val chainIndex2 = aliceSession.cryptoService().getSharedWithInfo(testData.roomId, sessionId).getObject(bobSecondSession.myUserId, bobSecondSession.sessionParams.credentials.deviceId)
+        val chainIndex2 = aliceSession.cryptoService().getSharedWithInfo(testData.roomId, sessionId).getObject(
+                bobSecondSession.myUserId,
+                bobSecondSession.sessionParams.credentials.deviceId
+        )
 
         Assert.assertEquals("Alice should have marked bob's device for this session", 1, chainIndex2)
 
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPasswordTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPasswordTest.kt
index d035fe5fde..9bf08f6fc0 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPasswordTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPasswordTest.kt
@@ -54,9 +54,11 @@ class KeysBackupPasswordTest : InstrumentedTest {
         assertEquals(OlmPkDecryption.privateKeyLength(), generatePrivateKeyResult.privateKey.size)
 
         // Reverse operation
-        val retrievedPrivateKey = retrievePrivateKeyWithPassword(PASSWORD,
+        val retrievedPrivateKey = retrievePrivateKeyWithPassword(
+                PASSWORD,
                 generatePrivateKeyResult.salt,
-                generatePrivateKeyResult.iterations)
+                generatePrivateKeyResult.iterations
+        )
 
         assertEquals(OlmPkDecryption.privateKeyLength(), retrievedPrivateKey.size)
         assertArrayEquals(generatePrivateKeyResult.privateKey, retrievedPrivateKey)
@@ -102,9 +104,11 @@ class KeysBackupPasswordTest : InstrumentedTest {
         assertEquals(OlmPkDecryption.privateKeyLength(), generatePrivateKeyResult.privateKey.size)
 
         // Reverse operation, with bad password
-        val retrievedPrivateKey = retrievePrivateKeyWithPassword(BAD_PASSWORD,
+        val retrievedPrivateKey = retrievePrivateKeyWithPassword(
+                BAD_PASSWORD,
                 generatePrivateKeyResult.salt,
-                generatePrivateKeyResult.iterations)
+                generatePrivateKeyResult.iterations
+        )
 
         assertEquals(OlmPkDecryption.privateKeyLength(), retrievedPrivateKey.size)
         assertByteArrayNotEqual(generatePrivateKeyResult.privateKey, retrievedPrivateKey)
@@ -122,9 +126,11 @@ class KeysBackupPasswordTest : InstrumentedTest {
         assertEquals(OlmPkDecryption.privateKeyLength(), generatePrivateKeyResult.privateKey.size)
 
         // Reverse operation, with bad iteration
-        val retrievedPrivateKey = retrievePrivateKeyWithPassword(PASSWORD,
+        val retrievedPrivateKey = retrievePrivateKeyWithPassword(
+                PASSWORD,
                 generatePrivateKeyResult.salt,
-                500_001)
+                500_001
+        )
 
         assertEquals(OlmPkDecryption.privateKeyLength(), retrievedPrivateKey.size)
         assertByteArrayNotEqual(generatePrivateKeyResult.privateKey, retrievedPrivateKey)
@@ -142,9 +148,11 @@ class KeysBackupPasswordTest : InstrumentedTest {
         assertEquals(OlmPkDecryption.privateKeyLength(), generatePrivateKeyResult.privateKey.size)
 
         // Reverse operation, with bad iteration
-        val retrievedPrivateKey = retrievePrivateKeyWithPassword(PASSWORD,
+        val retrievedPrivateKey = retrievePrivateKeyWithPassword(
+                PASSWORD,
                 BAD_SALT,
-                generatePrivateKeyResult.iterations)
+                generatePrivateKeyResult.iterations
+        )
 
         assertEquals(OlmPkDecryption.privateKeyLength(), retrievedPrivateKey.size)
         assertByteArrayNotEqual(generatePrivateKeyResult.privateKey, retrievedPrivateKey)
@@ -168,7 +176,8 @@ class KeysBackupPasswordTest : InstrumentedTest {
                 116.toByte(), 224.toByte(), 229.toByte(), 224.toByte(), 9.toByte(), 3.toByte(), 178.toByte(), 162.toByte(),
                 120.toByte(), 23.toByte(), 108.toByte(), 218.toByte(), 22.toByte(), 61.toByte(), 241.toByte(), 200.toByte(),
                 235.toByte(), 173.toByte(), 236.toByte(), 100.toByte(), 115.toByte(), 247.toByte(), 33.toByte(), 132.toByte(),
-                195.toByte(), 154.toByte(), 64.toByte(), 158.toByte(), 184.toByte(), 148.toByte(), 20.toByte(), 85.toByte())
+                195.toByte(), 154.toByte(), 64.toByte(), 158.toByte(), 184.toByte(), 148.toByte(), 20.toByte(), 85.toByte()
+        )
 
         assertArrayEquals(privateKeyBytes, retrievedPrivateKey)
     }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
index 063c0c0ca3..a7ddb6c553 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
@@ -41,6 +41,7 @@ import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysVersion
 import org.matrix.android.sdk.api.session.crypto.keysbackup.MegolmBackupCreationInfo
 import org.matrix.android.sdk.api.session.crypto.keysbackup.toKeysVersionResult
 import org.matrix.android.sdk.api.session.crypto.model.ImportRoomKeysResult
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.common.CommonTestHelper
 import org.matrix.android.sdk.common.CryptoTestHelper
 import org.matrix.android.sdk.common.TestConstants
@@ -271,10 +272,12 @@ class KeysBackupTest : InstrumentedTest {
         assertNotNull(decryption)
         // - Check decryptKeyBackupData() returns stg
         val sessionData = keysBackup
-                .decryptKeyBackupData(keyBackupData,
+                .decryptKeyBackupData(
+                        keyBackupData,
                         session.olmInboundGroupSession!!.sessionIdentifier(),
                         cryptoTestData.roomId,
-                        decryption!!)
+                        decryption!!
+                )
         assertNotNull(sessionData)
         // - Compare the decrypted megolm key with the original one
         keysBackupTestHelper.assertKeysEquals(session.exportKeys(), sessionData)
@@ -296,7 +299,8 @@ class KeysBackupTest : InstrumentedTest {
 
         // - Restore the e2e backup from the homeserver
         val importRoomKeysResult = testHelper.doSync<ImportRoomKeysResult> {
-            testData.aliceSession2.cryptoService().keysBackupService().restoreKeysWithRecoveryKey(testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
+            testData.aliceSession2.cryptoService().keysBackupService().restoreKeysWithRecoveryKey(
+                    testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
                     testData.prepareKeysBackupDataResult.megolmBackupCreationInfo.recoveryKey,
                     null,
                     null,
@@ -679,7 +683,8 @@ class KeysBackupTest : InstrumentedTest {
         val steps = ArrayList<StepProgressListener.Step>()
 
         val importRoomKeysResult = testHelper.doSync<ImportRoomKeysResult> {
-            testData.aliceSession2.cryptoService().keysBackupService().restoreKeyBackupWithPassword(testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
+            testData.aliceSession2.cryptoService().keysBackupService().restoreKeyBackupWithPassword(
+                    testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
                     password,
                     null,
                     null,
@@ -770,7 +775,8 @@ class KeysBackupTest : InstrumentedTest {
 
         // - Restore the e2e backup with the recovery key.
         val importRoomKeysResult = testHelper.doSync<ImportRoomKeysResult> {
-            testData.aliceSession2.cryptoService().keysBackupService().restoreKeysWithRecoveryKey(testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
+            testData.aliceSession2.cryptoService().keysBackupService().restoreKeysWithRecoveryKey(
+                    testData.aliceSession2.cryptoService().keysBackupService().keysBackupVersion!!,
                     testData.prepareKeysBackupDataResult.megolmBackupCreationInfo.recoveryKey,
                     null,
                     null,
@@ -1054,7 +1060,11 @@ class KeysBackupTest : InstrumentedTest {
         assertFalse(keysBackup2.isEnabled)
 
         // - Validate the old device from the new one
-        aliceSession2.cryptoService().setDeviceVerification(DeviceTrustLevel(crossSigningVerified = false, locallyVerified = true), aliceSession2.myUserId, oldDeviceId)
+        aliceSession2.cryptoService().setDeviceVerification(
+                DeviceTrustLevel(crossSigningVerified = false, locallyVerified = true),
+                aliceSession2.myUserId,
+                oldDeviceId
+        )
 
         // -> Backup should automatically enable on the new device
         val latch4 = CountDownLatch(1)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt
index ac83cb8882..90e7fc1e45 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt
@@ -88,10 +88,12 @@ internal class KeysBackupTestHelper(
 
         stateObserver.stopAndCheckStates(null)
 
-        return KeysBackupScenarioData(cryptoTestData,
+        return KeysBackupScenarioData(
+                cryptoTestData,
                 aliceKeys,
                 prepareKeysBackupDataResult,
-                aliceSession2)
+                aliceSession2
+        )
     }
 
     fun prepareAndCreateKeysBackupData(keysBackup: KeysBackupService,
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
index d6baa4b1e0..c758050fc9 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
@@ -60,7 +60,7 @@ class QuadSTests : InstrumentedTest {
 
         val aliceSession = testHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
 
-        val quadS = aliceSession.sharedSecretStorageService
+        val quadS = aliceSession.sharedSecretStorageService()
 
         val TEST_KEY_ID = "my.test.Key"
 
@@ -120,7 +120,7 @@ class QuadSTests : InstrumentedTest {
         // Store a secret
         val clearSecret = "42".toByteArray().toBase64NoPadding()
         testHelper.runBlockingTest {
-            aliceSession.sharedSecretStorageService.storeSecret(
+            aliceSession.sharedSecretStorageService().storeSecret(
                     "secret.of.life",
                     clearSecret,
                     listOf(SharedSecretStorageService.KeyRef(null, keySpec)) // default key
@@ -141,7 +141,7 @@ class QuadSTests : InstrumentedTest {
         // Try to decrypt??
 
         val decryptedSecret = testHelper.runBlockingTest {
-            aliceSession.sharedSecretStorageService.getSecret(
+            aliceSession.sharedSecretStorageService().getSecret(
                     "secret.of.life",
                     null, // default key
                     keySpec!!
@@ -158,7 +158,7 @@ class QuadSTests : InstrumentedTest {
 
         val aliceSession = testHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
 
-        val quadS = aliceSession.sharedSecretStorageService
+        val quadS = aliceSession.sharedSecretStorageService()
 
         val TEST_KEY_ID = "my.test.Key"
 
@@ -187,7 +187,7 @@ class QuadSTests : InstrumentedTest {
         val mySecretText = "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
 
         testHelper.runBlockingTest {
-            aliceSession.sharedSecretStorageService.storeSecret(
+            aliceSession.sharedSecretStorageService().storeSecret(
                     "my.secret",
                     mySecretText.toByteArray().toBase64NoPadding(),
                     listOf(
@@ -207,14 +207,16 @@ class QuadSTests : InstrumentedTest {
 
         // Assert that can decrypt with both keys
         testHelper.runBlockingTest {
-            aliceSession.sharedSecretStorageService.getSecret("my.secret",
+            aliceSession.sharedSecretStorageService().getSecret(
+                    "my.secret",
                     keyId1,
                     RawBytesKeySpec.fromRecoveryKey(key1Info.recoveryKey)!!
             )
         }
 
         testHelper.runBlockingTest {
-            aliceSession.sharedSecretStorageService.getSecret("my.secret",
+            aliceSession.sharedSecretStorageService().getSecret(
+                    "my.secret",
                     keyId2,
                     RawBytesKeySpec.fromRecoveryKey(key2Info.recoveryKey)!!
             )
@@ -236,7 +238,7 @@ class QuadSTests : InstrumentedTest {
         val mySecretText = "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
 
         testHelper.runBlockingTest {
-            aliceSession.sharedSecretStorageService.storeSecret(
+            aliceSession.sharedSecretStorageService().storeSecret(
                     "my.secret",
                     mySecretText.toByteArray().toBase64NoPadding(),
                     listOf(SharedSecretStorageService.KeyRef(keyId1, RawBytesKeySpec.fromRecoveryKey(key1Info.recoveryKey)))
@@ -245,13 +247,15 @@ class QuadSTests : InstrumentedTest {
 
         testHelper.runBlockingTest {
             try {
-                aliceSession.sharedSecretStorageService.getSecret("my.secret",
+                aliceSession.sharedSecretStorageService().getSecret(
+                        "my.secret",
                         keyId1,
                         RawBytesKeySpec.fromPassphrase(
                                 "A bad passphrase",
                                 key1Info.content?.passphrase?.salt ?: "",
                                 key1Info.content?.passphrase?.iterations ?: 0,
-                                null)
+                                null
+                        )
                 )
             } catch (throwable: Throwable) {
                 assert(throwable is SharedSecretStorageError.BadMac)
@@ -260,13 +264,15 @@ class QuadSTests : InstrumentedTest {
 
         // Now try with correct key
         testHelper.runBlockingTest {
-            aliceSession.sharedSecretStorageService.getSecret("my.secret",
+            aliceSession.sharedSecretStorageService().getSecret(
+                    "my.secret",
                     keyId1,
                     RawBytesKeySpec.fromPassphrase(
                             passphrase,
                             key1Info.content?.passphrase?.salt ?: "",
                             key1Info.content?.passphrase?.iterations ?: 0,
-                            null)
+                            null
+                    )
             )
         }
 
@@ -292,7 +298,7 @@ class QuadSTests : InstrumentedTest {
     }
 
     private fun generatedSecret(session: Session, keyId: String, asDefault: Boolean = true): SsssKeyCreationInfo {
-        val quadS = session.sharedSecretStorageService
+        val quadS = session.sharedSecretStorageService()
         val testHelper = CommonTestHelper(context())
 
         val creationInfo = testHelper.runBlockingTest {
@@ -312,7 +318,7 @@ class QuadSTests : InstrumentedTest {
     }
 
     private fun generatedSecretFromPassphrase(session: Session, passphrase: String, keyId: String, asDefault: Boolean = true): SsssKeyCreationInfo {
-        val quadS = session.sharedSecretStorageService
+        val quadS = session.sharedSecretStorageService()
         val testHelper = CommonTestHelper(context())
 
         val creationInfo = testHelper.runBlockingTest {
@@ -321,7 +327,8 @@ class QuadSTests : InstrumentedTest {
                     keyId,
                     passphrase,
                     emptyKeySigner,
-                    null)
+                    null
+            )
         }
 
         assertAccountData(session, "${DefaultSharedSecretStorageService.KEY_ID_BASE}.$keyId")
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
index 14e659e2b6..2892cf8464 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
@@ -75,10 +75,12 @@ class SASTest : InstrumentedTest {
         }
         bobVerificationService.addListener(bobListener)
 
-        val txID = aliceVerificationService.beginKeyVerification(VerificationMethod.SAS,
+        val txID = aliceVerificationService.beginKeyVerification(
+                VerificationMethod.SAS,
                 bobSession.myUserId,
                 bobSession.cryptoService().getMyDevice().deviceId,
-                null)
+                null
+        )
         assertNotNull("Alice should have a started transaction", txID)
 
         val aliceKeyTx = aliceVerificationService.getExistingTransaction(bobSession.myUserId, txID!!)
@@ -467,8 +469,10 @@ class SASTest : InstrumentedTest {
         val aliceTx = aliceVerificationService.getExistingTransaction(bobUserId, verificationSAS!!) as SASDefaultVerificationTransaction
         val bobTx = bobVerificationService.getExistingTransaction(aliceSession.myUserId, verificationSAS) as SASDefaultVerificationTransaction
 
-        assertEquals("Should have same SAS", aliceTx.getShortCodeRepresentation(SasMode.DECIMAL),
-                bobTx.getShortCodeRepresentation(SasMode.DECIMAL))
+        assertEquals(
+                "Should have same SAS", aliceTx.getShortCodeRepresentation(SasMode.DECIMAL),
+                bobTx.getShortCodeRepresentation(SasMode.DECIMAL)
+        )
 
         cryptoTestData.cleanUp(testHelper)
     }
@@ -544,7 +548,8 @@ class SASTest : InstrumentedTest {
 
         // Assert that devices are verified
         val bobDeviceInfoFromAlicePOV: CryptoDeviceInfo? = aliceSession.cryptoService().getDeviceInfo(bobUserId, bobDeviceId)
-        val aliceDeviceInfoFromBobPOV: CryptoDeviceInfo? = bobSession.cryptoService().getDeviceInfo(aliceSession.myUserId, aliceSession.cryptoService().getMyDevice().deviceId)
+        val aliceDeviceInfoFromBobPOV: CryptoDeviceInfo? =
+                bobSession.cryptoService().getDeviceInfo(aliceSession.myUserId, aliceSession.cryptoService().getMyDevice().deviceId)
 
         assertTrue("alice device should be verified from bob point of view", aliceDeviceInfoFromBobPOV!!.isVerified)
         assertTrue("bob device should be verified from alice point of view", bobDeviceInfoFromAlicePOV!!.isVerified)
@@ -611,14 +616,16 @@ class SASTest : InstrumentedTest {
                 requestID!!,
                 cryptoTestData.roomId,
                 bobSession.myUserId,
-                bobSession.sessionParams.deviceId!!)
+                bobSession.sessionParams.deviceId!!
+        )
 
         bobVerificationService.beginKeyVerificationInDMs(
                 VerificationMethod.SAS,
                 requestID!!,
                 cryptoTestData.roomId,
                 aliceSession.myUserId,
-                aliceSession.sessionParams.deviceId!!)
+                aliceSession.sessionParams.deviceId!!
+        )
 
         // we should reach SHOW SAS on both
         var alicePovTx: SasVerificationTransaction?
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt
index 76bf6dc040..d7b4d636fc 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt
@@ -37,7 +37,8 @@ class QrCodeTest : InstrumentedTest {
             sharedSecret = "MTIzNDU2Nzg"
     )
 
-    private val value1 = "MATRIX\u0002\u0000\u0000\u000DMaTransaction\u0092Ñ0qCú²íq\u0087á®\u0013à\u0098\u0091\u000DÇéoÃ\"_²lq]hC«¢UMynd¤Ù.ô\u0091XäÏ\u0094ê\u008B«\u009Døl\u000F¿+\u008CË\u0014¤®õÁ\u008BA¥12345678"
+    private val value1 =
+            "MATRIX\u0002\u0000\u0000\u000DMaTransaction\u0092Ñ0qCú²íq\u0087á®\u0013à\u0098\u0091\u000DÇéoÃ\"_²lq]hC«¢UMynd¤Ù.ô\u0091XäÏ\u0094ê\u008B«\u009Døl\u000F¿+\u008CË\u0014¤®õÁ\u008BA¥12345678"
 
     private val qrCode2 = QrCodeData.SelfVerifyingMasterKeyTrusted(
             transactionId = "MaTransaction",
@@ -46,7 +47,8 @@ class QrCodeTest : InstrumentedTest {
             sharedSecret = "MTIzNDU2Nzg"
     )
 
-    private val value2 = "MATRIX\u0002\u0001\u0000\u000DMaTransaction\u0092Ñ0qCú²íq\u0087á®\u0013à\u0098\u0091\u000DÇéoÃ\"_²lq]hC«¢UMynd¤Ù.ô\u0091XäÏ\u0094ê\u008B«\u009Døl\u000F¿+\u008CË\u0014¤®õÁ\u008BA¥12345678"
+    private val value2 =
+            "MATRIX\u0002\u0001\u0000\u000DMaTransaction\u0092Ñ0qCú²íq\u0087á®\u0013à\u0098\u0091\u000DÇéoÃ\"_²lq]hC«¢UMynd¤Ù.ô\u0091XäÏ\u0094ê\u008B«\u009Døl\u000F¿+\u008CË\u0014¤®õÁ\u008BA¥12345678"
 
     private val qrCode3 = QrCodeData.SelfVerifyingMasterKeyNotTrusted(
             transactionId = "MaTransaction",
@@ -55,7 +57,8 @@ class QrCodeTest : InstrumentedTest {
             sharedSecret = "MTIzNDU2Nzg"
     )
 
-    private val value3 = "MATRIX\u0002\u0002\u0000\u000DMaTransactionMynd¤Ù.ô\u0091XäÏ\u0094ê\u008B«\u009Døl\u000F¿+\u008CË\u0014¤®õÁ\u008BA¥\u0092Ñ0qCú²íq\u0087á®\u0013à\u0098\u0091\u000DÇéoÃ\"_²lq]hC«¢U12345678"
+    private val value3 =
+            "MATRIX\u0002\u0002\u0000\u000DMaTransactionMynd¤Ù.ô\u0091XäÏ\u0094ê\u008B«\u009Døl\u000F¿+\u008CË\u0014¤®õÁ\u008BA¥\u0092Ñ0qCú²íq\u0087á®\u0013à\u0098\u0091\u000DÇéoÃ\"_²lq]hC«¢U12345678"
 
     private val sharedSecretByteArray = "12345678".toByteArray(Charsets.ISO_8859_1)
 
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
index 2c96568102..6097bf8c93 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
@@ -155,8 +155,8 @@ class VerificationTest : InstrumentedTest {
                        bobSupportedMethods: List<VerificationMethod>,
                        expectedResultForAlice: ExpectedResult,
                        expectedResultForBob: ExpectedResult) {
-         val testHelper = CommonTestHelper(context())
-         val cryptoTestHelper = CryptoTestHelper(testHelper)
+        val testHelper = CommonTestHelper(context())
+        val cryptoTestHelper = CryptoTestHelper(testHelper)
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
 
         val aliceSession = cryptoTestData.firstSession
@@ -175,7 +175,8 @@ class VerificationTest : InstrumentedTest {
                                             )
                                     )
                                 }
-                            }, callback)
+                            }, callback
+                    )
         }
 
         testHelper.doSync<Unit> { callback ->
@@ -191,7 +192,8 @@ class VerificationTest : InstrumentedTest {
                                             )
                                     )
                                 }
-                            }, callback)
+                            }, callback
+                    )
         }
 
         val aliceVerificationService = aliceSession.cryptoService().verificationService()
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
index ef98ed22c7..acb23bf723 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
@@ -71,10 +71,12 @@ class MarkdownParserTest : InstrumentedTest {
         testIdentity("")
         testIdentity("a")
         testIdentity("1")
-        testIdentity("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et " +
-                "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea com" +
-                "modo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pari" +
-                "atur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")
+        testIdentity(
+                "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et " +
+                        "dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea com" +
+                        "modo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pari" +
+                        "atur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+        )
     }
 
     @Test
@@ -294,16 +296,20 @@ class MarkdownParserTest : InstrumentedTest {
         "$markdownPattern$name$markdownPattern"
                 .let {
                     markdownParser.parse(it)
-                            .expect(expectedText = it,
-                                    expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag>")
+                            .expect(
+                                    expectedText = it,
+                                    expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag>"
+                            )
                 }
 
         // Test twice the same tag
         "$markdownPattern$name$markdownPattern and $markdownPattern$name bis$markdownPattern"
                 .let {
                     markdownParser.parse(it)
-                            .expect(expectedText = it,
-                                    expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag> and <$htmlExpectedTag>$name bis</$htmlExpectedTag>")
+                            .expect(
+                                    expectedText = it,
+                                    expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag> and <$htmlExpectedTag>$name bis</$htmlExpectedTag>"
+                            )
                 }
 
         val textBefore = "a"
@@ -313,48 +319,60 @@ class MarkdownParserTest : InstrumentedTest {
         "$textBefore$markdownPattern$name$markdownPattern"
                 .let {
                     markdownParser.parse(it)
-                            .expect(expectedText = it,
-                                    expectedFormattedText = "$textBefore<$htmlExpectedTag>$name</$htmlExpectedTag>")
+                            .expect(
+                                    expectedText = it,
+                                    expectedFormattedText = "$textBefore<$htmlExpectedTag>$name</$htmlExpectedTag>"
+                            )
                 }
 
         // With text before and space
         "$textBefore $markdownPattern$name$markdownPattern"
                 .let {
                     markdownParser.parse(it)
-                            .expect(expectedText = it,
-                                    expectedFormattedText = "$textBefore <$htmlExpectedTag>$name</$htmlExpectedTag>")
+                            .expect(
+                                    expectedText = it,
+                                    expectedFormattedText = "$textBefore <$htmlExpectedTag>$name</$htmlExpectedTag>"
+                            )
                 }
 
         // With sticked text after
         "$markdownPattern$name$markdownPattern$textAfter"
                 .let {
                     markdownParser.parse(it)
-                            .expect(expectedText = it,
-                                    expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag>$textAfter")
+                            .expect(
+                                    expectedText = it,
+                                    expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag>$textAfter"
+                            )
                 }
 
         // With space and text after
         "$markdownPattern$name$markdownPattern $textAfter"
                 .let {
                     markdownParser.parse(it)
-                            .expect(expectedText = it,
-                                    expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag> $textAfter")
+                            .expect(
+                                    expectedText = it,
+                                    expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag> $textAfter"
+                            )
                 }
 
         // With sticked text before and text after
         "$textBefore$markdownPattern$name$markdownPattern$textAfter"
                 .let {
                     markdownParser.parse(it)
-                            .expect(expectedText = it,
-                                    expectedFormattedText = "a<$htmlExpectedTag>$name</$htmlExpectedTag>$textAfter")
+                            .expect(
+                                    expectedText = it,
+                                    expectedFormattedText = "a<$htmlExpectedTag>$name</$htmlExpectedTag>$textAfter"
+                            )
                 }
 
         // With text before and after, with spaces
         "$textBefore $markdownPattern$name$markdownPattern $textAfter"
                 .let {
                     markdownParser.parse(it)
-                            .expect(expectedText = it,
-                                    expectedFormattedText = "$textBefore <$htmlExpectedTag>$name</$htmlExpectedTag> $textAfter")
+                            .expect(
+                                    expectedText = it,
+                                    expectedFormattedText = "$textBefore <$htmlExpectedTag>$name</$htmlExpectedTag> $textAfter"
+                            )
                 }
     }
 
@@ -366,16 +384,20 @@ class MarkdownParserTest : InstrumentedTest {
         "$markdownPattern$name\n$name$markdownPattern"
                 .let {
                     markdownParser.parse(it)
-                            .expect(expectedText = it,
-                                    expectedFormattedText = "<$htmlExpectedTag>$name$softBreak$name</$htmlExpectedTag>")
+                            .expect(
+                                    expectedText = it,
+                                    expectedFormattedText = "<$htmlExpectedTag>$name$softBreak$name</$htmlExpectedTag>"
+                            )
                 }
 
         // With new line between two blocks
         "$markdownPattern$name$markdownPattern\n$markdownPattern$name$markdownPattern"
                 .let {
                     markdownParser.parse(it)
-                            .expect(expectedText = it,
-                                    expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag><br /><$htmlExpectedTag>$name</$htmlExpectedTag>")
+                            .expect(
+                                    expectedText = it,
+                                    expectedFormattedText = "<$htmlExpectedTag>$name</$htmlExpectedTag><br /><$htmlExpectedTag>$name</$htmlExpectedTag>"
+                            )
                 }
     }
 
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/util/JsonCanonicalizerTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/util/JsonCanonicalizerTest.kt
index d38afc6b62..67eafea55d 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/util/JsonCanonicalizerTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/util/JsonCanonicalizerTest.kt
@@ -39,27 +39,35 @@ internal class JsonCanonicalizerTest : InstrumentedTest {
                 """{"a":["c":"b","d":"e"]}""",
                 """{"a":["d":"b","c":"e"]}"""
         ).forEach {
-            assertEquals(it,
-                    JsonCanonicalizer.canonicalize(it))
+            assertEquals(
+                    it,
+                    JsonCanonicalizer.canonicalize(it)
+            )
         }
     }
 
     @Test
     fun reorderTest() {
-        assertEquals("""{"a":true,"b":false}""",
-                JsonCanonicalizer.canonicalize("""{"b":false,"a":true}"""))
+        assertEquals(
+                """{"a":true,"b":false}""",
+                JsonCanonicalizer.canonicalize("""{"b":false,"a":true}""")
+        )
     }
 
     @Test
     fun realSampleTest() {
-        assertEquals("""{"algorithms":["m.megolm.v1.aes-sha2","m.olm.v1.curve25519-aes-sha2"],"device_id":"VSCUNFSOUI","keys":{"curve25519:VSCUNFSOUI":"utyOjnhiQ73qNhi9HlN0OgWIowe5gthTS8r0r9TcJ3o","ed25519:VSCUNFSOUI":"qNhEt+Yggaajet0hX\/FjTRLfySgs65ldYyomm7PIx6U"},"user_id":"@benoitx:matrix.org"}""",
-                JsonCanonicalizer.canonicalize("""{"algorithms":["m.megolm.v1.aes-sha2","m.olm.v1.curve25519-aes-sha2"],"device_id":"VSCUNFSOUI","user_id":"@benoitx:matrix.org","keys":{"curve25519:VSCUNFSOUI":"utyOjnhiQ73qNhi9HlN0OgWIowe5gthTS8r0r9TcJ3o","ed25519:VSCUNFSOUI":"qNhEt+Yggaajet0hX/FjTRLfySgs65ldYyomm7PIx6U"}}"""))
+        assertEquals(
+                """{"algorithms":["m.megolm.v1.aes-sha2","m.olm.v1.curve25519-aes-sha2"],"device_id":"VSCUNFSOUI","keys":{"curve25519:VSCUNFSOUI":"utyOjnhiQ73qNhi9HlN0OgWIowe5gthTS8r0r9TcJ3o","ed25519:VSCUNFSOUI":"qNhEt+Yggaajet0hX\/FjTRLfySgs65ldYyomm7PIx6U"},"user_id":"@benoitx:matrix.org"}""",
+                JsonCanonicalizer.canonicalize("""{"algorithms":["m.megolm.v1.aes-sha2","m.olm.v1.curve25519-aes-sha2"],"device_id":"VSCUNFSOUI","user_id":"@benoitx:matrix.org","keys":{"curve25519:VSCUNFSOUI":"utyOjnhiQ73qNhi9HlN0OgWIowe5gthTS8r0r9TcJ3o","ed25519:VSCUNFSOUI":"qNhEt+Yggaajet0hX/FjTRLfySgs65ldYyomm7PIx6U"}}""")
+        )
     }
 
     @Test
     fun doubleQuoteTest() {
-        assertEquals("{\"a\":\"\\\"\"}",
-                JsonCanonicalizer.canonicalize("{\"a\":\"\\\"\"}"))
+        assertEquals(
+                "{\"a\":\"\\\"\"}",
+                JsonCanonicalizer.canonicalize("{\"a\":\"\\\"\"}")
+        )
     }
 
     /* ==========================================================================================
@@ -68,38 +76,52 @@ internal class JsonCanonicalizerTest : InstrumentedTest {
 
     @Test
     fun matrixOrg001Test() {
-        assertEquals("""{}""",
-                JsonCanonicalizer.canonicalize("""{}"""))
+        assertEquals(
+                """{}""",
+                JsonCanonicalizer.canonicalize("""{}""")
+        )
     }
 
     @Test
     fun matrixOrg002Test() {
-        assertEquals("""{"one":1,"two":"Two"}""",
-                JsonCanonicalizer.canonicalize("""{
+        assertEquals(
+                """{"one":1,"two":"Two"}""",
+                JsonCanonicalizer.canonicalize(
+                        """{
     "one": 1,
     "two": "Two"
-}"""))
+}"""
+                )
+        )
     }
 
     @Test
     fun matrixOrg003Test() {
-        assertEquals("""{"a":"1","b":"2"}""",
-                JsonCanonicalizer.canonicalize("""{
+        assertEquals(
+                """{"a":"1","b":"2"}""",
+                JsonCanonicalizer.canonicalize(
+                        """{
     "b": "2",
     "a": "1"
-}"""))
+}"""
+                )
+        )
     }
 
     @Test
     fun matrixOrg004Test() {
-        assertEquals("""{"a":"1","b":"2"}""",
-                JsonCanonicalizer.canonicalize("""{"b":"2","a":"1"}"""))
+        assertEquals(
+                """{"a":"1","b":"2"}""",
+                JsonCanonicalizer.canonicalize("""{"b":"2","a":"1"}""")
+        )
     }
 
     @Test
     fun matrixOrg005Test() {
-        assertEquals("""{"auth":{"mxid":"@john.doe:example.com","profile":{"display_name":"John Doe","three_pids":[{"address":"john.doe@example.org","medium":"email"},{"address":"123456789","medium":"msisdn"}]},"success":true}}""",
-                JsonCanonicalizer.canonicalize("""{
+        assertEquals(
+                """{"auth":{"mxid":"@john.doe:example.com","profile":{"display_name":"John Doe","three_pids":[{"address":"john.doe@example.org","medium":"email"},{"address":"123456789","medium":"msisdn"}]},"success":true}}""",
+                JsonCanonicalizer.canonicalize(
+                        """{
     "auth": {
         "success": true,
         "mxid": "@john.doe:example.com",
@@ -117,37 +139,53 @@ internal class JsonCanonicalizerTest : InstrumentedTest {
             ]
         }
     }
-}"""))
+}"""
+                )
+        )
     }
 
     @Test
     fun matrixOrg006Test() {
-        assertEquals("""{"a":"日本語"}""",
-                JsonCanonicalizer.canonicalize("""{
+        assertEquals(
+                """{"a":"日本語"}""",
+                JsonCanonicalizer.canonicalize(
+                        """{
     "a": "日本語"
-}"""))
+}"""
+                )
+        )
     }
 
     @Test
     fun matrixOrg007Test() {
-        assertEquals("""{"日":1,"本":2}""",
-                JsonCanonicalizer.canonicalize("""{
+        assertEquals(
+                """{"日":1,"本":2}""",
+                JsonCanonicalizer.canonicalize(
+                        """{
     "本": 2,
     "日": 1
-}"""))
+}"""
+                )
+        )
     }
 
     @Test
     fun matrixOrg008Test() {
-        assertEquals("""{"a":"日"}""",
-                JsonCanonicalizer.canonicalize("{\"a\": \"\u65E5\"}"))
+        assertEquals(
+                """{"a":"日"}""",
+                JsonCanonicalizer.canonicalize("{\"a\": \"\u65E5\"}")
+        )
     }
 
     @Test
     fun matrixOrg009Test() {
-        assertEquals("""{"a":null}""",
-                JsonCanonicalizer.canonicalize("""{
+        assertEquals(
+                """{"a":null}""",
+                JsonCanonicalizer.canonicalize(
+                        """{
     "a": null
-}"""))
+}"""
+                )
+        )
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/ordering/StringOrderTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/ordering/StringOrderTest.kt
index 728986441a..b5870ebf69 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/ordering/StringOrderTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/ordering/StringOrderTest.kt
@@ -26,9 +26,18 @@ class StringOrderTest {
 
     @Test
     fun testbasing() {
-        assertEquals("a", StringOrderUtils.baseToString(StringOrderUtils.stringToBase("a", StringOrderUtils.DEFAULT_ALPHABET), StringOrderUtils.DEFAULT_ALPHABET))
-        assertEquals("element", StringOrderUtils.baseToString(StringOrderUtils.stringToBase("element", StringOrderUtils.DEFAULT_ALPHABET), StringOrderUtils.DEFAULT_ALPHABET))
-        assertEquals("matrix", StringOrderUtils.baseToString(StringOrderUtils.stringToBase("matrix", StringOrderUtils.DEFAULT_ALPHABET), StringOrderUtils.DEFAULT_ALPHABET))
+        assertEquals(
+                "a",
+                StringOrderUtils.baseToString(StringOrderUtils.stringToBase("a", StringOrderUtils.DEFAULT_ALPHABET), StringOrderUtils.DEFAULT_ALPHABET)
+        )
+        assertEquals(
+                "element",
+                StringOrderUtils.baseToString(StringOrderUtils.stringToBase("element", StringOrderUtils.DEFAULT_ALPHABET), StringOrderUtils.DEFAULT_ALPHABET)
+        )
+        assertEquals(
+                "matrix",
+                StringOrderUtils.baseToString(StringOrderUtils.stringToBase("matrix", StringOrderUtils.DEFAULT_ALPHABET), StringOrderUtils.DEFAULT_ALPHABET)
+        )
     }
 
     @Test
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/threads/ThreadMessagingTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/threads/ThreadMessagingTest.kt
index dcb181f0c1..a2984dd27e 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/threads/ThreadMessagingTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/threads/ThreadMessagingTest.kt
@@ -31,6 +31,7 @@ import org.matrix.android.sdk.InstrumentedTest
 import org.matrix.android.sdk.api.session.events.model.getRootThreadEventId
 import org.matrix.android.sdk.api.session.events.model.isTextMessage
 import org.matrix.android.sdk.api.session.events.model.isThread
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
 import org.matrix.android.sdk.common.CommonTestHelper
@@ -58,7 +59,8 @@ class ThreadMessagingTest : InstrumentedTest {
         val sentMessages = commonTestHelper.sendTextMessage(
                 room = aliceRoom,
                 message = textMessage,
-                nbOfMessages = 1)
+                nbOfMessages = 1
+        )
 
         val initMessage = sentMessages.first()
 
@@ -72,7 +74,8 @@ class ThreadMessagingTest : InstrumentedTest {
                 room = aliceRoom,
                 message = "Reply In the above thread",
                 numberOfMessages = 1,
-                rootThreadEventId = initMessage.root.eventId.orEmpty())
+                rootThreadEventId = initMessage.root.eventId.orEmpty()
+        )
 
         val replyInThread = repliesInThread.first()
         replyInThread.root.isThread().shouldBeTrue()
@@ -80,7 +83,7 @@ class ThreadMessagingTest : InstrumentedTest {
         replyInThread.root.getRootThreadEventId().shouldBeEqualTo(initMessage.root.eventId)
 
         // The init normal message should now be a root thread event
-        val timeline = aliceRoom.createTimeline(null, TimelineSettings(30))
+        val timeline = aliceRoom.timelineService().createTimeline(null, TimelineSettings(30))
         timeline.start()
 
         aliceSession.startSync(true)
@@ -115,7 +118,8 @@ class ThreadMessagingTest : InstrumentedTest {
         val sentMessages = commonTestHelper.sendTextMessage(
                 room = aliceRoom,
                 message = textMessage,
-                nbOfMessages = 1)
+                nbOfMessages = 1
+        )
 
         val initMessage = sentMessages.first()
 
@@ -133,7 +137,8 @@ class ThreadMessagingTest : InstrumentedTest {
                 room = bobRoom,
                 message = "Reply In the above thread",
                 numberOfMessages = 1,
-                rootThreadEventId = initMessage.root.eventId.orEmpty())
+                rootThreadEventId = initMessage.root.eventId.orEmpty()
+        )
 
         val replyInThread = repliesInThread.first()
         replyInThread.root.isThread().shouldBeTrue()
@@ -141,7 +146,7 @@ class ThreadMessagingTest : InstrumentedTest {
         replyInThread.root.getRootThreadEventId().shouldBeEqualTo(initMessage.root.eventId)
 
         // The init normal message should now be a root thread event
-        val timeline = aliceRoom.createTimeline(null, TimelineSettings(30))
+        val timeline = aliceRoom.timelineService().createTimeline(null, TimelineSettings(30))
         timeline.start()
 
         aliceSession.startSync(true)
@@ -189,7 +194,8 @@ class ThreadMessagingTest : InstrumentedTest {
         val sentMessages = commonTestHelper.sendTextMessage(
                 room = aliceRoom,
                 message = textMessage,
-                nbOfMessages = 5)
+                nbOfMessages = 5
+        )
 
         sentMessages.forEach {
             it.root.isThread().shouldBeFalse()
@@ -205,7 +211,8 @@ class ThreadMessagingTest : InstrumentedTest {
                 room = aliceRoom,
                 message = "Reply In the above thread",
                 numberOfMessages = 40,
-                rootThreadEventId = selectedInitMessage.root.eventId.orEmpty())
+                rootThreadEventId = selectedInitMessage.root.eventId.orEmpty()
+        )
 
         repliesInThread.forEach {
             it.root.isThread().shouldBeTrue()
@@ -214,7 +221,7 @@ class ThreadMessagingTest : InstrumentedTest {
         }
 
         // The init normal message should now be a root thread event
-        val timeline = aliceRoom.createTimeline(null, TimelineSettings(30))
+        val timeline = aliceRoom.timelineService().createTimeline(null, TimelineSettings(30))
         timeline.start()
 
         aliceSession.startSync(true)
@@ -252,7 +259,8 @@ class ThreadMessagingTest : InstrumentedTest {
         val sentMessages = commonTestHelper.sendTextMessage(
                 room = aliceRoom,
                 message = textMessage,
-                nbOfMessages = 5)
+                nbOfMessages = 5
+        )
 
         sentMessages.forEach {
             it.root.isThread().shouldBeFalse()
@@ -269,7 +277,8 @@ class ThreadMessagingTest : InstrumentedTest {
                 room = aliceRoom,
                 message = "Alice reply In the above second thread message",
                 numberOfMessages = 35,
-                rootThreadEventId = secondMessage.root.eventId.orEmpty())
+                rootThreadEventId = secondMessage.root.eventId.orEmpty()
+        )
 
         // Let's reply in timeline to that message from another user
         val bobSession = cryptoTestData.secondSession!!
@@ -281,14 +290,16 @@ class ThreadMessagingTest : InstrumentedTest {
                 room = bobRoom,
                 message = "Bob reply In the above first thread message",
                 numberOfMessages = 42,
-                rootThreadEventId = firstMessage.root.eventId.orEmpty())
+                rootThreadEventId = firstMessage.root.eventId.orEmpty()
+        )
 
         // Bob will also reply in second thread 5 times
         val bobThreadRepliesInSecondMessage = commonTestHelper.replyInThreadMessage(
                 room = bobRoom,
                 message = "Another Bob reply In the above second thread message",
                 numberOfMessages = 20,
-                rootThreadEventId = secondMessage.root.eventId.orEmpty())
+                rootThreadEventId = secondMessage.root.eventId.orEmpty()
+        )
 
         aliceThreadRepliesInSecondMessage.forEach {
             it.root.isThread().shouldBeTrue()
@@ -309,7 +320,7 @@ class ThreadMessagingTest : InstrumentedTest {
         }
 
         // The init normal message should now be a root thread event
-        val timeline = aliceRoom.createTimeline(null, TimelineSettings(30))
+        val timeline = aliceRoom.timelineService().createTimeline(null, TimelineSettings(30))
         timeline.start()
 
         aliceSession.startSync(true)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt
index 5c011c8b2f..94b2ba55a3 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt
@@ -35,6 +35,7 @@ import org.matrix.android.sdk.internal.database.mapper.toEntity
 import org.matrix.android.sdk.internal.database.model.ChunkEntity
 import org.matrix.android.sdk.internal.database.model.SessionRealmModule
 import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection
+import org.matrix.android.sdk.internal.util.time.DefaultClock
 import org.matrix.android.sdk.session.room.timeline.RoomDataHelper.createFakeListOfEvents
 import org.matrix.android.sdk.session.room.timeline.RoomDataHelper.createFakeMessageEvent
 
@@ -42,6 +43,7 @@ import org.matrix.android.sdk.session.room.timeline.RoomDataHelper.createFakeMes
 internal class ChunkEntityTest : InstrumentedTest {
 
     private lateinit var monarchy: Monarchy
+    private val clock = DefaultClock()
 
     @Before
     fun setup() {
@@ -59,14 +61,15 @@ internal class ChunkEntityTest : InstrumentedTest {
         monarchy.runTransactionSync { realm ->
             val chunk: ChunkEntity = realm.createObject()
 
-            val fakeEvent = createFakeMessageEvent().toEntity(ROOM_ID, SendState.SYNCED, System.currentTimeMillis()).let {
+            val fakeEvent = createFakeMessageEvent().toEntity(ROOM_ID, SendState.SYNCED, clock.epochMillis()).let {
                 realm.copyToRealm(it)
             }
             chunk.addTimelineEvent(
                     roomId = ROOM_ID,
                     eventEntity = fakeEvent,
                     direction = PaginationDirection.FORWARDS,
-                    roomMemberContentsByUser = emptyMap())
+                    roomMemberContentsByUser = emptyMap()
+            )
             chunk.timelineEvents.size shouldBeEqualTo 1
         }
     }
@@ -75,19 +78,21 @@ internal class ChunkEntityTest : InstrumentedTest {
     fun add_shouldNotAdd_whenAlreadyIncluded() {
         monarchy.runTransactionSync { realm ->
             val chunk: ChunkEntity = realm.createObject()
-            val fakeEvent = createFakeMessageEvent().toEntity(ROOM_ID, SendState.SYNCED, System.currentTimeMillis()).let {
+            val fakeEvent = createFakeMessageEvent().toEntity(ROOM_ID, SendState.SYNCED, clock.epochMillis()).let {
                 realm.copyToRealm(it)
             }
             chunk.addTimelineEvent(
                     roomId = ROOM_ID,
                     eventEntity = fakeEvent,
                     direction = PaginationDirection.FORWARDS,
-                    roomMemberContentsByUser = emptyMap())
+                    roomMemberContentsByUser = emptyMap()
+            )
             chunk.addTimelineEvent(
                     roomId = ROOM_ID,
                     eventEntity = fakeEvent,
                     direction = PaginationDirection.FORWARDS,
-                    roomMemberContentsByUser = emptyMap())
+                    roomMemberContentsByUser = emptyMap()
+            )
             chunk.timelineEvents.size shouldBeEqualTo 1
         }
     }
@@ -153,14 +158,15 @@ internal class ChunkEntityTest : InstrumentedTest {
                                    events: List<Event>,
                                    direction: PaginationDirection) {
         events.forEach { event ->
-            val fakeEvent = event.toEntity(roomId, SendState.SYNCED, System.currentTimeMillis()).let {
+            val fakeEvent = event.toEntity(roomId, SendState.SYNCED, clock.epochMillis()).let {
                 realm.copyToRealm(it)
             }
             addTimelineEvent(
                     roomId = roomId,
                     eventEntity = fakeEvent,
                     direction = direction,
-                    roomMemberContentsByUser = emptyMap())
+                    roomMemberContentsByUser = emptyMap()
+            )
         }
     }
 
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeGetContextOfEventTask.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeGetContextOfEventTask.kt
index b86c86c0c7..ccf1c7c2c9 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeGetContextOfEventTask.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeGetContextOfEventTask.kt
@@ -26,8 +26,8 @@ internal class FakeGetContextOfEventTask constructor(private val tokenChunkEvent
     override suspend fun execute(params: GetContextOfEventTask.Params): TokenChunkEventPersistor.Result {
         val fakeEvents = RoomDataHelper.createFakeListOfEvents(30)
         val tokenChunkEvent = FakeTokenChunkEvent(
-                Random.nextLong(System.currentTimeMillis()).toString(),
-                Random.nextLong(System.currentTimeMillis()).toString(),
+                Random.nextLong().toString(),
+                Random.nextLong().toString(),
                 fakeEvents
         )
         return tokenChunkEventPersistor.insertInDb(tokenChunkEvent, params.roomId, PaginationDirection.BACKWARDS)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakePaginationTask.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakePaginationTask.kt
index d09bfb18c6..f241be0c5c 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakePaginationTask.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakePaginationTask.kt
@@ -25,7 +25,7 @@ internal class FakePaginationTask @Inject constructor(private val tokenChunkEven
 
     override suspend fun execute(params: PaginationTask.Params): TokenChunkEventPersistor.Result {
         val fakeEvents = RoomDataHelper.createFakeListOfEvents(30)
-        val tokenChunkEvent = FakeTokenChunkEvent(params.from, Random.nextLong(System.currentTimeMillis()).toString(), fakeEvents)
+        val tokenChunkEvent = FakeTokenChunkEvent(params.from, Random.nextLong().toString(), fakeEvents)
         return tokenChunkEventPersistor.insertInDb(tokenChunkEvent, params.roomId, params.direction)
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/PollAggregationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/PollAggregationTest.kt
index 6792d6ddfd..61ab6d4b40 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/PollAggregationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/PollAggregationTest.kt
@@ -30,6 +30,7 @@ import org.junit.runners.MethodSorters
 import org.matrix.android.sdk.InstrumentedTest
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.model.PollResponseAggregatedSummary
 import org.matrix.android.sdk.api.session.room.model.PollSummaryContent
 import org.matrix.android.sdk.api.session.room.model.message.MessagePollContent
@@ -57,10 +58,10 @@ class PollAggregationTest : InstrumentedTest {
 
         val roomFromBobPOV = cryptoTestData.secondSession!!.getRoom(cryptoTestData.roomId)!!
         // Bob creates a poll
-        roomFromBobPOV.sendPoll(PollType.DISCLOSED, pollQuestion, pollOptions)
+        roomFromBobPOV.sendService().sendPoll(PollType.DISCLOSED, pollQuestion, pollOptions)
 
         aliceSession.startSync(true)
-        val aliceTimeline = roomFromAlicePOV.createTimeline(null, TimelineSettings(30))
+        val aliceTimeline = roomFromAlicePOV.timelineService().createTimeline(null, TimelineSettings(30))
         aliceTimeline.start()
 
         val TOTAL_TEST_COUNT = 7
@@ -83,37 +84,37 @@ class PollAggregationTest : InstrumentedTest {
                             // Poll has just been created.
                             testInitialPollConditions(pollContent, pollSummary)
                             lock.countDown()
-                            roomFromBobPOV.voteToPoll(pollEventId, pollContent.getBestPollCreationInfo()?.answers?.firstOrNull()?.id ?: "")
+                            roomFromBobPOV.sendService().voteToPoll(pollEventId, pollContent.getBestPollCreationInfo()?.answers?.firstOrNull()?.id ?: "")
                         }
                         TOTAL_TEST_COUNT - 1 -> {
                             // Bob: Option 1
                             testBobVotesOption1(pollContent, pollSummary)
                             lock.countDown()
-                            roomFromBobPOV.voteToPoll(pollEventId, pollContent.getBestPollCreationInfo()?.answers?.get(1)?.id ?: "")
+                            roomFromBobPOV.sendService().voteToPoll(pollEventId, pollContent.getBestPollCreationInfo()?.answers?.get(1)?.id ?: "")
                         }
                         TOTAL_TEST_COUNT - 2 -> {
                             // Bob: Option 2
                             testBobChangesVoteToOption2(pollContent, pollSummary)
                             lock.countDown()
-                            roomFromAlicePOV.voteToPoll(pollEventId, pollContent.getBestPollCreationInfo()?.answers?.get(1)?.id ?: "")
+                            roomFromAlicePOV.sendService().voteToPoll(pollEventId, pollContent.getBestPollCreationInfo()?.answers?.get(1)?.id ?: "")
                         }
                         TOTAL_TEST_COUNT - 3 -> {
                             // Alice: Option 2, Bob: Option 2
                             testAliceAndBobVoteToOption2(pollContent, pollSummary)
                             lock.countDown()
-                            roomFromAlicePOV.voteToPoll(pollEventId, pollContent.getBestPollCreationInfo()?.answers?.firstOrNull()?.id ?: "")
+                            roomFromAlicePOV.sendService().voteToPoll(pollEventId, pollContent.getBestPollCreationInfo()?.answers?.firstOrNull()?.id ?: "")
                         }
                         TOTAL_TEST_COUNT - 4 -> {
                             // Alice: Option 1, Bob: Option 2
                             testAliceVotesOption1AndBobVotesOption2(pollContent, pollSummary)
                             lock.countDown()
-                            roomFromBobPOV.endPoll(pollEventId)
+                            roomFromBobPOV.sendService().endPoll(pollEventId)
                         }
                         TOTAL_TEST_COUNT - 5 -> {
                             // Alice: Option 1, Bob: Option 2 [poll is ended]
                             testEndedPoll(pollSummary)
                             lock.countDown()
-                            roomFromAlicePOV.voteToPoll(pollEventId, pollContent.getBestPollCreationInfo()?.answers?.get(1)?.id ?: "")
+                            roomFromAlicePOV.sendService().voteToPoll(pollEventId, pollContent.getBestPollCreationInfo()?.answers?.get(1)?.id ?: "")
                         }
                         TOTAL_TEST_COUNT - 6 -> {
                             // Alice: Option 1 (ignore change), Bob: Option 2 [poll is ended]
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt
index ee44af58b3..d5b4a07fc0 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt
@@ -30,6 +30,7 @@ import org.matrix.android.sdk.InstrumentedTest
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
@@ -70,11 +71,12 @@ class TimelineForwardPaginationTest : InstrumentedTest {
         val sentMessages = commonTestHelper.sendTextMessage(
                 roomFromAlicePOV,
                 message,
-                numberOfMessagesToSend)
+                numberOfMessagesToSend
+        )
 
         // Alice clear the cache and restart the sync
         commonTestHelper.clearCacheAndSync(aliceSession)
-        val aliceTimeline = roomFromAlicePOV.createTimeline(null, TimelineSettings(30))
+        val aliceTimeline = roomFromAlicePOV.timelineService().createTimeline(null, TimelineSettings(30))
         aliceTimeline.start()
 
         // Alice sees the 10 last message of the room, and can only navigate BACKWARD
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt
index c6d40bcaa2..6e5fed8df9 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt
@@ -28,6 +28,7 @@ import org.matrix.android.sdk.InstrumentedTest
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
@@ -62,7 +63,7 @@ class TimelinePreviousLastForwardTest : InstrumentedTest {
         val roomFromAlicePOV = aliceSession.getRoom(aliceRoomId)!!
         val roomFromBobPOV = bobSession.getRoom(aliceRoomId)!!
 
-        val bobTimeline = roomFromBobPOV.createTimeline(null, TimelineSettings(30))
+        val bobTimeline = roomFromBobPOV.timelineService().createTimeline(null, TimelineSettings(30))
         bobTimeline.start()
 
         run {
@@ -93,7 +94,8 @@ class TimelinePreviousLastForwardTest : InstrumentedTest {
         val firstMessageFromAliceId = commonTestHelper.sendTextMessage(
                 roomFromAlicePOV,
                 firstMessage,
-                30)
+                30
+        )
                 .last()
                 .eventId
 
@@ -129,7 +131,8 @@ class TimelinePreviousLastForwardTest : InstrumentedTest {
         commonTestHelper.sendTextMessage(
                 roomFromAlicePOV,
                 secondMessage,
-                30)
+                30
+        )
 
         // Bob start to sync
         bobSession.startSync(true)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineSimpleBackPaginationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineSimpleBackPaginationTest.kt
index 53f76f1c46..42f710d7cf 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineSimpleBackPaginationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineSimpleBackPaginationTest.kt
@@ -28,6 +28,7 @@ import org.matrix.android.sdk.InstrumentedTest
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.isTextMessage
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
@@ -63,9 +64,10 @@ class TimelineSimpleBackPaginationTest : InstrumentedTest {
         commonTestHelper.sendTextMessage(
                 roomFromAlicePOV,
                 message,
-                numberOfMessagesToSent)
+                numberOfMessagesToSent
+        )
 
-        val bobTimeline = roomFromBobPOV.createTimeline(null, TimelineSettings(30))
+        val bobTimeline = roomFromBobPOV.timelineService().createTimeline(null, TimelineSettings(30))
         bobTimeline.start()
 
         commonTestHelper.waitWithLatch(timeout = TestConstants.timeOutMillis * 10) {
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineWithManyMembersTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineWithManyMembersTest.kt
index ce02b2b527..02430dda74 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineWithManyMembersTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineWithManyMembersTest.kt
@@ -27,6 +27,7 @@ import org.junit.runners.MethodSorters
 import org.matrix.android.sdk.InstrumentedTest
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
 import org.matrix.android.sdk.common.CommonTestHelper
@@ -71,7 +72,7 @@ class TimelineWithManyMembersTest : InstrumentedTest {
         for (index in 1 until cryptoTestData.sessions.size) {
             val session = cryptoTestData.sessions[index]
             val roomForCurrentMember = session.getRoom(cryptoTestData.roomId)!!
-            val timelineForCurrentMember = roomForCurrentMember.createTimeline(null, TimelineSettings(30))
+            val timelineForCurrentMember = roomForCurrentMember.timelineService().createTimeline(null, TimelineSettings(30))
             timelineForCurrentMember.start()
 
             session.startSync(true)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
index fa07cf5a02..e17b7efbd6 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
@@ -24,6 +24,7 @@ import org.junit.runners.JUnit4
 import org.junit.runners.MethodSorters
 import org.matrix.android.sdk.InstrumentedTest
 import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.search.SearchResult
 import org.matrix.android.sdk.common.CommonTestHelper
 import org.matrix.android.sdk.common.CryptoTestData
@@ -59,9 +60,10 @@ class SearchMessagesTest : InstrumentedTest {
     fun sendTextMessageAndSearchPartOfItUsingRoom() {
         doTest { cryptoTestData ->
             cryptoTestData.firstSession
-                    .getRoom(cryptoTestData.roomId)!!
+                    .searchService()
                     .search(
                             searchTerm = "lore",
+                            roomId = cryptoTestData.roomId,
                             limit = 10,
                             includeProfile = true,
                             afterLimit = 0,
@@ -83,7 +85,8 @@ class SearchMessagesTest : InstrumentedTest {
         commonTestHelper.sendTextMessage(
                 roomFromAlicePOV,
                 MESSAGE,
-                2)
+                2
+        )
 
         val data = commonTestHelper.runBlockingTest {
             block.invoke(cryptoTestData)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
index 3b0f7586cc..b9760c1bfc 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
@@ -29,6 +29,7 @@ import org.junit.runners.MethodSorters
 import org.matrix.android.sdk.InstrumentedTest
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.getStateEvent
 import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.model.RoomGuestAccessContent
@@ -147,7 +148,7 @@ class SpaceCreationTest : InstrumentedTest {
         // create a room
         var firstChild: String? = null
         commonTestHelper.waitWithLatch {
-            firstChild = aliceSession.createRoom(CreateRoomParams().apply {
+            firstChild = aliceSession.roomService().createRoom(CreateRoomParams().apply {
                 this.name = "FirstRoom"
                 this.topic = "Description of first room"
                 this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
@@ -162,7 +163,7 @@ class SpaceCreationTest : InstrumentedTest {
 
         var secondChild: String? = null
         commonTestHelper.waitWithLatch {
-            secondChild = aliceSession.createRoom(CreateRoomParams().apply {
+            secondChild = aliceSession.roomService().createRoom(CreateRoomParams().apply {
                 this.name = "SecondRoom"
                 this.topic = "Description of second room"
                 this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
index 20faa81bb6..6a17cb74ad 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
@@ -35,6 +35,9 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.getRoomSummary
+import org.matrix.android.sdk.api.session.room.getStateEvent
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesAllowEntry
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
@@ -68,7 +71,7 @@ class SpaceHierarchyTest : InstrumentedTest {
 
         var roomId = ""
         commonTestHelper.waitWithLatch {
-            roomId = session.createRoom(CreateRoomParams().apply { name = "General" })
+            roomId = session.roomService().createRoom(CreateRoomParams().apply { name = "General" })
             it.countDown()
         }
 
@@ -174,21 +177,27 @@ class SpaceHierarchyTest : InstrumentedTest {
         val commonTestHelper = CommonTestHelper(context())
         val session = commonTestHelper.createAccount("John", SessionTestParams(true))
 
-        val spaceAInfo = createPublicSpace(session, "SpaceA", listOf(
+        val spaceAInfo = createPublicSpace(
+                session, "SpaceA", listOf(
                 Triple("A1", true /*auto-join*/, true/*canonical*/),
                 Triple("A2", true, true)
-        ))
+        )
+        )
 
-        /* val spaceBInfo = */ createPublicSpace(session, "SpaceB", listOf(
+        /* val spaceBInfo = */ createPublicSpace(
+                session, "SpaceB", listOf(
                 Triple("B1", true /*auto-join*/, true/*canonical*/),
                 Triple("B2", true, true),
                 Triple("B3", true, true)
-        ))
+        )
+        )
 
-        val spaceCInfo = createPublicSpace(session, "SpaceC", listOf(
+        val spaceCInfo = createPublicSpace(
+                session, "SpaceC", listOf(
                 Triple("C1", true /*auto-join*/, true/*canonical*/),
                 Triple("C2", true, true)
-        ))
+        )
+        )
 
         // add C as a subspace of A
         val spaceA = session.spaceService().getSpace(spaceAInfo.spaceId)
@@ -203,27 +212,27 @@ class SpaceHierarchyTest : InstrumentedTest {
 
         var orphan1 = ""
         commonTestHelper.waitWithLatch {
-            orphan1 = session.createRoom(CreateRoomParams().apply { name = "O1" })
+            orphan1 = session.roomService().createRoom(CreateRoomParams().apply { name = "O1" })
             it.countDown()
         }
 
         var orphan2 = ""
         commonTestHelper.waitWithLatch {
-            orphan2 = session.createRoom(CreateRoomParams().apply { name = "O2" })
+            orphan2 = session.roomService().createRoom(CreateRoomParams().apply { name = "O2" })
             it.countDown()
         }
 
-        val allRooms = session.getRoomSummaries(roomSummaryQueryParams { excludeType = listOf(RoomType.SPACE) })
+        val allRooms = session.roomService().getRoomSummaries(roomSummaryQueryParams { excludeType = listOf(RoomType.SPACE) })
 
         assertEquals("Unexpected number of rooms", 9, allRooms.size)
 
-        val orphans = session.getFlattenRoomSummaryChildrenOf(null)
+        val orphans = session.roomService().getFlattenRoomSummaryChildrenOf(null)
 
         assertEquals("Unexpected number of orphan rooms", 2, orphans.size)
         assertTrue("O1 should be an orphan", orphans.any { it.roomId == orphan1 })
         assertTrue("O2 should be an orphan ${orphans.map { it.name }}", orphans.any { it.roomId == orphan2 })
 
-        val aChildren = session.getFlattenRoomSummaryChildrenOf(spaceAInfo.spaceId)
+        val aChildren = session.roomService().getFlattenRoomSummaryChildrenOf(spaceAInfo.spaceId)
 
         assertEquals("Unexpected number of flatten child rooms", 4, aChildren.size)
         assertTrue("A1 should be a child of A", aChildren.any { it.name == "A1" })
@@ -233,13 +242,13 @@ class SpaceHierarchyTest : InstrumentedTest {
 
         // Add a non canonical child and check that it does not appear as orphan
         commonTestHelper.waitWithLatch {
-            val a3 = session.createRoom(CreateRoomParams().apply { name = "A3" })
+            val a3 = session.roomService().createRoom(CreateRoomParams().apply { name = "A3" })
             spaceA!!.addChildren(a3, viaServers, null, false)
             it.countDown()
         }
 
         Thread.sleep(6_000)
-        val orphansUpdate = session.getRoomSummaries(roomSummaryQueryParams {
+        val orphansUpdate = session.roomService().getRoomSummaries(roomSummaryQueryParams {
             activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null)
         })
         assertEquals("Unexpected number of orphan rooms ${orphansUpdate.map { it.name }}", 2, orphansUpdate.size)
@@ -251,15 +260,19 @@ class SpaceHierarchyTest : InstrumentedTest {
         val commonTestHelper = CommonTestHelper(context())
         val session = commonTestHelper.createAccount("John", SessionTestParams(true))
 
-        val spaceAInfo = createPublicSpace(session, "SpaceA", listOf(
+        val spaceAInfo = createPublicSpace(
+                session, "SpaceA", listOf(
                 Triple("A1", true /*auto-join*/, true/*canonical*/),
                 Triple("A2", true, true)
-        ))
+        )
+        )
 
-        val spaceCInfo = createPublicSpace(session, "SpaceC", listOf(
+        val spaceCInfo = createPublicSpace(
+                session, "SpaceC", listOf(
                 Triple("C1", true /*auto-join*/, true/*canonical*/),
                 Triple("C2", true, true)
-        ))
+        )
+        )
 
         // add C as a subspace of A
         val spaceA = session.spaceService().getSpace(spaceAInfo.spaceId)
@@ -279,7 +292,7 @@ class SpaceHierarchyTest : InstrumentedTest {
 
         // A -> C -> A
 
-        val aChildren = session.getFlattenRoomSummaryChildrenOf(spaceAInfo.spaceId)
+        val aChildren = session.roomService().getFlattenRoomSummaryChildrenOf(spaceAInfo.spaceId)
 
         assertEquals("Unexpected number of flatten child rooms ${aChildren.map { it.name }}", 4, aChildren.size)
         assertTrue("A1 should be a child of A", aChildren.any { it.name == "A1" })
@@ -293,16 +306,20 @@ class SpaceHierarchyTest : InstrumentedTest {
         val commonTestHelper = CommonTestHelper(context())
         val session = commonTestHelper.createAccount("John", SessionTestParams(true))
 
-        val spaceAInfo = createPublicSpace(session, "SpaceA", listOf(
+        val spaceAInfo = createPublicSpace(
+                session, "SpaceA", listOf(
                 Triple("A1", true /*auto-join*/, true/*canonical*/),
                 Triple("A2", true, true)
-        ))
+        )
+        )
 
-        val spaceBInfo = createPublicSpace(session, "SpaceB", listOf(
+        val spaceBInfo = createPublicSpace(
+                session, "SpaceB", listOf(
                 Triple("B1", true /*auto-join*/, true/*canonical*/),
                 Triple("B2", true, true),
                 Triple("B3", true, true)
-        ))
+        )
+        )
 
         // add B as a subspace of A
         val spaceA = session.spaceService().getSpace(spaceAInfo.spaceId)
@@ -312,14 +329,16 @@ class SpaceHierarchyTest : InstrumentedTest {
             session.spaceService().setSpaceParent(spaceBInfo.spaceId, spaceAInfo.spaceId, true, viaServers)
         }
 
-        val spaceCInfo = createPublicSpace(session, "SpaceC", listOf(
+        val spaceCInfo = createPublicSpace(
+                session, "SpaceC", listOf(
                 Triple("C1", true /*auto-join*/, true/*canonical*/),
                 Triple("C2", true, true)
-        ))
+        )
+        )
 
         commonTestHelper.waitWithLatch { latch ->
 
-            val flatAChildren = session.getFlattenRoomSummaryChildrenOfLive(spaceAInfo.spaceId)
+            val flatAChildren = session.roomService().getFlattenRoomSummaryChildrenOfLive(spaceAInfo.spaceId)
             val childObserver = object : Observer<List<RoomSummary>> {
                 override fun onChanged(children: List<RoomSummary>?) {
 //                    Log.d("## TEST", "Space A flat children update : ${children?.map { it.name }}")
@@ -346,7 +365,7 @@ class SpaceHierarchyTest : InstrumentedTest {
         val bRoomId = spaceBInfo.roomIds.first()
 
         commonTestHelper.waitWithLatch { latch ->
-            val flatAChildren = session.getFlattenRoomSummaryChildrenOfLive(spaceAInfo.spaceId)
+            val flatAChildren = session.roomService().getFlattenRoomSummaryChildrenOfLive(spaceAInfo.spaceId)
             val childObserver = object : Observer<List<RoomSummary>> {
                 override fun onChanged(children: List<RoomSummary>?) {
                     System.out.println("## TEST | Space A flat children update : ${children?.map { it.name }}")
@@ -359,7 +378,7 @@ class SpaceHierarchyTest : InstrumentedTest {
             }
 
             // part from b room
-            session.leaveRoom(bRoomId)
+            session.roomService().leaveRoom(bRoomId)
             // The room should have disapear from flat children
             flatAChildren.observeForever(childObserver)
         }
@@ -385,7 +404,7 @@ class SpaceHierarchyTest : InstrumentedTest {
             val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
 
             roomIds = childInfo.map { entry ->
-                session.createRoom(CreateRoomParams().apply { name = entry.first })
+                session.roomService().createRoom(CreateRoomParams().apply { name = entry.first })
             }
             roomIds.forEachIndexed { index, roomId ->
                 syncedSpace!!.addChildren(roomId, viaServers, null, childInfo[index].second)
@@ -414,8 +433,9 @@ class SpaceHierarchyTest : InstrumentedTest {
             roomIds =
                     childInfo.map { entry ->
                         val homeServerCapabilities = session
+                                .homeServerCapabilitiesService()
                                 .getHomeServerCapabilities()
-                        session.createRoom(CreateRoomParams().apply {
+                        session.roomService().createRoom(CreateRoomParams().apply {
                             name = entry.first
                             this.featurePreset = RestrictedRoomPreset(
                                     homeServerCapabilities,
@@ -442,21 +462,27 @@ class SpaceHierarchyTest : InstrumentedTest {
         val commonTestHelper = CommonTestHelper(context())
         val session = commonTestHelper.createAccount("John", SessionTestParams(true))
 
-        /* val spaceAInfo = */ createPublicSpace(session, "SpaceA", listOf(
+        /* val spaceAInfo = */ createPublicSpace(
+                session, "SpaceA", listOf(
                 Triple("A1", true /*auto-join*/, true/*canonical*/),
                 Triple("A2", true, true)
-        ))
+        )
+        )
 
-        val spaceBInfo = createPublicSpace(session, "SpaceB", listOf(
+        val spaceBInfo = createPublicSpace(
+                session, "SpaceB", listOf(
                 Triple("B1", true /*auto-join*/, true/*canonical*/),
                 Triple("B2", true, true),
                 Triple("B3", true, true)
-        ))
+        )
+        )
 
-        val spaceCInfo = createPublicSpace(session, "SpaceC", listOf(
+        val spaceCInfo = createPublicSpace(
+                session, "SpaceC", listOf(
                 Triple("C1", true /*auto-join*/, true/*canonical*/),
                 Triple("C2", true, true)
-        ))
+        )
+        )
 
         val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
 
@@ -475,7 +501,9 @@ class SpaceHierarchyTest : InstrumentedTest {
         //   + C
         //     + c1, c2
 
-        val rootSpaces = session.spaceService().getRootSpaceSummaries()
+        val rootSpaces = commonTestHelper.runBlockingTest {
+            session.spaceService().getRootSpaceSummaries()
+        }
 
         assertEquals("Unexpected number of root spaces ${rootSpaces.map { it.name }}", 2, rootSpaces.size)
 
@@ -488,28 +516,30 @@ class SpaceHierarchyTest : InstrumentedTest {
         val aliceSession = commonTestHelper.createAccount("Alice", SessionTestParams(true))
         val bobSession = commonTestHelper.createAccount("Bib", SessionTestParams(true))
 
-        val spaceAInfo = createPrivateSpace(aliceSession, "Private Space A", listOf(
+        val spaceAInfo = createPrivateSpace(
+                aliceSession, "Private Space A", listOf(
                 Triple("General", true /*suggested*/, true/*canonical*/),
                 Triple("Random", true, true)
-        ))
+        )
+        )
 
         commonTestHelper.runBlockingTest {
-            aliceSession.getRoom(spaceAInfo.spaceId)!!.invite(bobSession.myUserId, null)
+            aliceSession.getRoom(spaceAInfo.spaceId)!!.membershipService().invite(bobSession.myUserId, null)
         }
 
         commonTestHelper.runBlockingTest {
-            bobSession.joinRoom(spaceAInfo.spaceId, null, emptyList())
+            bobSession.roomService().joinRoom(spaceAInfo.spaceId, null, emptyList())
         }
 
         var bobRoomId = ""
         commonTestHelper.waitWithLatch {
-            bobRoomId = bobSession.createRoom(CreateRoomParams().apply { name = "A Bob Room" })
-            bobSession.getRoom(bobRoomId)!!.invite(aliceSession.myUserId)
+            bobRoomId = bobSession.roomService().createRoom(CreateRoomParams().apply { name = "A Bob Room" })
+            bobSession.getRoom(bobRoomId)!!.membershipService().invite(aliceSession.myUserId)
             it.countDown()
         }
 
         commonTestHelper.runBlockingTest {
-            aliceSession.joinRoom(bobRoomId)
+            aliceSession.roomService().joinRoom(bobRoomId)
         }
 
         commonTestHelper.waitWithLatch { latch ->
@@ -549,7 +579,7 @@ class SpaceHierarchyTest : InstrumentedTest {
                     ?.setUserPowerLevel(aliceSession.myUserId, Role.Admin.value)
                     ?.toContent()
 
-            room.sendStateEvent(EventType.STATE_ROOM_POWER_LEVELS, stateKey = "", newPowerLevelsContent!!)
+            room.stateService().sendStateEvent(EventType.STATE_ROOM_POWER_LEVELS, stateKey = "", newPowerLevelsContent!!)
             it.countDown()
         }
 
diff --git a/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt b/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt
index 3add757efa..6dd3553d02 100644
--- a/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt
+++ b/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt
@@ -37,7 +37,7 @@ import javax.inject.Inject
  */
 @MatrixScope
 internal class CurlLoggingInterceptor @Inject constructor() :
-    Interceptor {
+        Interceptor {
 
     /**
      * Set any additional curl command options (see 'curl --help').
diff --git a/matrix-sdk-android/src/main/java/org/commonmark/ext/maths/internal/MathsHtmlNodeRenderer.kt b/matrix-sdk-android/src/main/java/org/commonmark/ext/maths/internal/MathsHtmlNodeRenderer.kt
index 0efecbbe8a..83fcae7190 100644
--- a/matrix-sdk-android/src/main/java/org/commonmark/ext/maths/internal/MathsHtmlNodeRenderer.kt
+++ b/matrix-sdk-android/src/main/java/org/commonmark/ext/maths/internal/MathsHtmlNodeRenderer.kt
@@ -28,8 +28,12 @@ internal class MathsHtmlNodeRenderer(private val context: HtmlNodeRendererContex
         val display = node.javaClass == DisplayMaths::class.java
         val contents = node.firstChild // should be the only child
         val latex = (contents as Text).literal
-        val attributes = context.extendAttributes(node, if (display) "div" else "span", Collections.singletonMap("data-mx-maths",
-                latex))
+        val attributes = context.extendAttributes(
+                node, if (display) "div" else "span", Collections.singletonMap(
+                "data-mx-maths",
+                latex
+        )
+        )
         html.tag(if (display) "div" else "span", attributes)
         html.tag("code")
         context.render(contents)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
index e7b4b766ad..e7d1e64a2b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
@@ -43,7 +43,8 @@ import javax.inject.Inject
 
 /**
  * This is the main entry point to the matrix sdk.
- * To get the singleton instance, use getInstance static method.
+ * <br/>
+ * See [Companion.createInstance] to create an instance. The app should create and manage the instance itself.
  */
 class Matrix private constructor(context: Context, matrixConfiguration: MatrixConfiguration) {
 
@@ -74,9 +75,7 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
 
     fun getUserAgent() = userAgentHolder.userAgent
 
-    fun authenticationService(): AuthenticationService {
-        return authenticationService
-    }
+    fun authenticationService() = authenticationService
 
     fun rawService() = rawService
 
@@ -84,9 +83,7 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
 
     fun homeServerHistoryService() = homeServerHistoryService
 
-    fun legacySessionImporter(): LegacySessionImporter {
-        return legacySessionImporter
-    }
+    fun legacySessionImporter() = legacySessionImporter
 
     fun workerFactory(): WorkerFactory = matrixWorkerFactory
 
@@ -135,14 +132,19 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
                     val matrixConfiguration = (appContext as MatrixConfiguration.Provider).providesMatrixConfiguration()
                     instance = Matrix(appContext, matrixConfiguration)
                 } else {
-                    throw IllegalStateException("Matrix is not initialized properly." +
-                            " If you want to manage your own Matrix instance use Matrix.createInstance" +
-                            " otherwise you should call Matrix.initialize or let your application implement MatrixConfiguration.Provider.")
+                    throw IllegalStateException(
+                            "Matrix is not initialized properly." +
+                                    " If you want to manage your own Matrix instance use Matrix.createInstance" +
+                                    " otherwise you should call Matrix.initialize or let your application implement MatrixConfiguration.Provider."
+                    )
                 }
             }
             return instance
         }
 
+        /**
+         * @return a String with details about the Matrix SDK version
+         */
         fun getSdkVersion(): String {
             return BuildConfig.SDK_VERSION + " (" + BuildConfig.GIT_SDK_REVISION + ")"
         }
diff --git a/vector/src/main/java/im/vector/app/features/login/terms/UrlAndName.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/UrlAndName.kt
similarity index 87%
rename from vector/src/main/java/im/vector/app/features/login/terms/UrlAndName.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/UrlAndName.kt
index f298aeca37..ca0123b832 100644
--- a/vector/src/main/java/im/vector/app/features/login/terms/UrlAndName.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/UrlAndName.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.login.terms
+package org.matrix.android.sdk.api.auth
 
 data class UrlAndName(
         val url: String,
diff --git a/vector/src/main/java/im/vector/app/features/login/terms/converter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/converter.kt
similarity index 90%
rename from vector/src/main/java/im/vector/app/features/login/terms/converter.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/converter.kt
index 64e4fb65d9..80630bc4e7 100644
--- a/vector/src/main/java/im/vector/app/features/login/terms/converter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/converter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.login.terms
+package org.matrix.android.sdk.api.auth
 
 import org.matrix.android.sdk.api.auth.data.LocalizedFlowDataLoginTerms
 import org.matrix.android.sdk.api.auth.registration.TermPolicies
@@ -102,12 +102,14 @@ fun TermPolicies.toLocalizedLoginTerms(userLanguage: String,
                 }
             }
 
-            result.add(LocalizedFlowDataLoginTerms(
-                    policyName = localizedFlowDataLoginTermsPolicyName,
-                    version = localizedFlowDataLoginTermsVersion,
-                    localizedUrl = localizedFlowDataLoginTermsLocalizedUrl,
-                    localizedName = localizedFlowDataLoginTermsLocalizedName
-            ))
+            result.add(
+                    LocalizedFlowDataLoginTerms(
+                            policyName = localizedFlowDataLoginTermsPolicyName,
+                            version = localizedFlowDataLoginTermsVersion,
+                            localizedUrl = localizedFlowDataLoginTermsLocalizedUrl,
+                            localizedName = localizedFlowDataLoginTermsLocalizedName
+                    )
+            )
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationFlowResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationFlowResponse.kt
index 0da9eb4b7e..2b421f2873 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationFlowResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationFlowResponse.kt
@@ -88,8 +88,10 @@ fun RegistrationFlowResponse.toFlowResult(): FlowResult {
         val isMandatory = flows?.all { type in it.stages.orEmpty() } == true
 
         val stage = when (type) {
-            LoginFlowTypes.RECAPTCHA      -> Stage.ReCaptcha(isMandatory, ((params?.get(type) as? Map<*, *>)?.get("public_key") as? String)
-                    ?: "")
+            LoginFlowTypes.RECAPTCHA      -> Stage.ReCaptcha(
+                    isMandatory, ((params?.get(type) as? Map<*, *>)?.get("public_key") as? String)
+                    ?: ""
+            )
             LoginFlowTypes.DUMMY          -> Stage.Dummy(isMandatory)
             LoginFlowTypes.TERMS          -> Stage.Terms(isMandatory, params?.get(type) as? TermPolicies ?: emptyMap<String, String>())
             LoginFlowTypes.EMAIL_IDENTITY -> Stage.Email(isMandatory)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt
index 621253faa5..0cda64499f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt
@@ -16,6 +16,8 @@
 
 package org.matrix.android.sdk.api.auth.registration
 
+import org.matrix.android.sdk.api.util.JsonDict
+
 /**
  * Set of methods to be able to create an account on a homeserver.
  *
@@ -73,6 +75,13 @@ interface RegistrationWizard {
      */
     suspend fun dummy(): RegistrationResult
 
+    /**
+     * Perform custom registration stage by sending a custom JsonDict.
+     * Current registration "session" param will be included into authParams by default.
+     * The authParams should contain at least one entry "type" with a String value.
+     */
+    suspend fun registrationCustom(authParams: JsonDict): RegistrationResult
+
     /**
      * Perform the "m.login.email.identity" or "m.login.msisdn" stage.
      *
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/GlobalError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/GlobalError.kt
index b5165b6687..5b4896f95f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/GlobalError.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/GlobalError.kt
@@ -23,5 +23,10 @@ sealed class GlobalError {
     data class InvalidToken(val softLogout: Boolean) : GlobalError()
     data class ConsentNotGivenError(val consentUri: String) : GlobalError()
     data class CertificateError(val fingerprint: Fingerprint) : GlobalError()
+
+    /**
+     * The SDK requires the app (which should request the user) to perform an initial sync.
+     */
+    data class InitialSyncRequest(val reason: InitialSyncRequestReason) : GlobalError()
     object ExpiredAccount : GlobalError()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/InitialSyncRequestReason.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/InitialSyncRequestReason.kt
new file mode 100644
index 0000000000..ebe07823f4
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/InitialSyncRequestReason.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.failure
+
+/**
+ * This enum provide the reason why the SDK request an initial sync to the application
+ */
+enum class InitialSyncRequestReason {
+    /**
+     * The list of ignored users has changed, and at least one user who was ignored is not ignored anymore
+     */
+    IGNORED_USERS_LIST_CHANGE,
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
index be924e2063..19502f0b46 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
@@ -24,10 +24,8 @@ import org.matrix.android.sdk.api.MatrixCoroutineDispatchers
 import org.matrix.android.sdk.api.auth.data.SessionParams
 import org.matrix.android.sdk.api.failure.GlobalError
 import org.matrix.android.sdk.api.federation.FederationService
-import org.matrix.android.sdk.api.pushrules.PushRuleService
 import org.matrix.android.sdk.api.session.account.AccountService
 import org.matrix.android.sdk.api.session.accountdata.SessionAccountDataService
-import org.matrix.android.sdk.api.session.cache.CacheService
 import org.matrix.android.sdk.api.session.call.CallSignalingService
 import org.matrix.android.sdk.api.session.content.ContentUploadStateTracker
 import org.matrix.android.sdk.api.session.content.ContentUrlResolver
@@ -47,6 +45,7 @@ import org.matrix.android.sdk.api.session.permalinks.PermalinkService
 import org.matrix.android.sdk.api.session.presence.PresenceService
 import org.matrix.android.sdk.api.session.profile.ProfileService
 import org.matrix.android.sdk.api.session.pushers.PushersService
+import org.matrix.android.sdk.api.session.pushrules.PushRuleService
 import org.matrix.android.sdk.api.session.room.RoomDirectoryService
 import org.matrix.android.sdk.api.session.room.RoomService
 import org.matrix.android.sdk.api.session.search.SearchService
@@ -68,26 +67,7 @@ import org.matrix.android.sdk.api.session.widgets.WidgetService
  * This interface defines interactions with a session.
  * An instance of a session will be provided by the SDK.
  */
-interface Session :
-        RoomService,
-        RoomDirectoryService,
-        GroupService,
-        UserService,
-        CacheService,
-        SignOutService,
-        FilterService,
-        TermsService,
-        EventService,
-        ProfileService,
-        PresenceService,
-        PushRuleService,
-        PushersService,
-        SyncStatusService,
-        HomeServerCapabilitiesService,
-        SecureStorageService,
-        AccountService,
-        ToDeviceService,
-        EventStreamService {
+interface Session {
 
     val coroutineDispatchers: MatrixCoroutineDispatchers
 
@@ -144,6 +124,11 @@ interface Session :
      */
     fun stopSync()
 
+    /**
+     * Clear cache of the session
+     */
+    suspend fun clearCache()
+
     /**
      * This method allows to listen the sync state.
      * @return a [LiveData] of [SyncState].
@@ -206,6 +191,96 @@ interface Session :
      */
     fun identityService(): IdentityService
 
+    /**
+     * Returns the HomeServerCapabilities service associated with the session
+     */
+    fun homeServerCapabilitiesService(): HomeServerCapabilitiesService
+
+    /**
+     * Returns the RoomService associated with the session
+     */
+    fun roomService(): RoomService
+
+    /**
+     * Returns the RoomDirectoryService associated with the session
+     */
+    fun roomDirectoryService(): RoomDirectoryService
+
+    /**
+     * Returns the GroupService associated with the session
+     */
+    fun groupService(): GroupService
+
+    /**
+     * Returns the UserService associated with the session
+     */
+    fun userService(): UserService
+
+    /**
+     * Returns the SignOutService associated with the session
+     */
+    fun signOutService(): SignOutService
+
+    /**
+     * Returns the FilterService associated with the session
+     */
+    fun filterService(): FilterService
+
+    /**
+     * Returns the PushRuleService associated with the session
+     */
+    fun pushRuleService(): PushRuleService
+
+    /**
+     * Returns the PushersService associated with the session
+     */
+    fun pushersService(): PushersService
+
+    /**
+     * Returns the EventService associated with the session
+     */
+    fun eventService(): EventService
+
+    /**
+     * Returns the TermsService associated with the session
+     */
+    fun termsService(): TermsService
+
+    /**
+     * Returns the SyncStatusService associated with the session
+     */
+    fun syncStatusService(): SyncStatusService
+
+    /**
+     * Returns the SecureStorageService associated with the session
+     */
+    fun secureStorageService(): SecureStorageService
+
+    /**
+     * Returns the ProfileService associated with the session
+     */
+    fun profileService(): ProfileService
+
+    /**
+     * Returns the PresenceService associated with the session
+     */
+    fun presenceService(): PresenceService
+
+    /**
+     * Returns the AccountService associated with the session
+     */
+    fun accountService(): AccountService
+
+    /**
+     * Returns the ToDeviceService associated with the session
+     */
+    fun toDeviceService(): ToDeviceService
+
+    /**
+     * Returns the EventStreamService associated with the session
+     */
+    fun eventStreamService(): EventStreamService
+
     /**
      * Returns the widget service associated with the session
      */
@@ -266,6 +341,11 @@ interface Session :
      */
     fun accountDataService(): SessionAccountDataService
 
+    /**
+     * Returns the SharedSecretStorageService associated with the session
+     */
+    fun sharedSecretStorageService(): SharedSecretStorageService
+
     /**
      * Add a listener to the session.
      * @param listener the listener to add.
@@ -298,12 +378,11 @@ interface Session :
          * Possible cases:
          * - The access token is not valid anymore,
          * - a M_CONSENT_NOT_GIVEN error has been received from the homeserver
+         * See [GlobalError] for all the possible cases
          */
         fun onGlobalError(session: Session, globalError: GlobalError) = Unit
     }
 
-    val sharedSecretStorageService: SharedSecretStorageService
-
     fun getUiaSsoFallbackUrl(authenticationSessionId: String): String
 
     /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/SessionExtensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/SessionExtensions.kt
new file mode 100644
index 0000000000..aeb0e7e4ee
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/SessionExtensions.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session
+
+import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.user.model.User
+
+/**
+ * Get a room using the RoomService of a Session
+ */
+fun Session.getRoom(roomId: String): Room? = roomService().getRoom(roomId)
+
+/**
+ * Get a room summary using the RoomService of a Session
+ */
+fun Session.getRoomSummary(roomIdOrAlias: String): RoomSummary? = roomService().getRoomSummary(roomIdOrAlias)
+
+/**
+ * Get a user using the UserService of a Session
+ */
+fun Session.getUser(userId: String): User? = userService().getUser(userId)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CryptoCrossSigningKey.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CryptoCrossSigningKey.kt
index 11996e673e..70ff76a4ef 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CryptoCrossSigningKey.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CryptoCrossSigningKey.kt
@@ -93,7 +93,8 @@ data class CryptoCrossSigningKey(
                     userId = userId,
                     usages = listOf(usage.value),
                     keys = mapOf("ed25519:$b64key" to b64key),
-                    signatures = signMap)
+                    signatures = signMap
+            )
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/IncomingRequestCancellation.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/IncomingRequestCancellation.kt
index 74ca7304f7..ad11ef9a5e 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/IncomingRequestCancellation.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/IncomingRequestCancellation.kt
@@ -46,8 +46,9 @@ data class IncomingRequestCancellation(
          * Factory
          *
          * @param event the event
+         * @param currentTimeMillis the current time in milliseconds
          */
-        fun fromEvent(event: Event): IncomingRequestCancellation? {
+        fun fromEvent(event: Event, currentTimeMillis: Long): IncomingRequestCancellation? {
             return event.getClearContent()
                     .toModel<ShareRequestCancellation>()
                     ?.let {
@@ -55,7 +56,7 @@ data class IncomingRequestCancellation(
                                 userId = event.senderId,
                                 deviceId = it.requestingDeviceId,
                                 requestId = it.requestId,
-                                localCreationTimestamp = event.ageLocalTs ?: System.currentTimeMillis()
+                                localCreationTimestamp = event.ageLocalTs ?: currentTimeMillis
                         )
                     }
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/IncomingRoomKeyRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/IncomingRoomKeyRequest.kt
index 45b0926d89..0b2c32284b 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/IncomingRoomKeyRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/IncomingRoomKeyRequest.kt
@@ -64,8 +64,9 @@ data class IncomingRoomKeyRequest(
          * Factory
          *
          * @param event the event
+         * @param currentTimeMillis the current time in milliseconds
          */
-        fun fromEvent(event: Event): IncomingRoomKeyRequest? {
+        fun fromEvent(event: Event, currentTimeMillis: Long): IncomingRoomKeyRequest? {
             return event.getClearContent()
                     .toModel<RoomKeyShareRequest>()
                     ?.let {
@@ -74,7 +75,7 @@ data class IncomingRoomKeyRequest(
                                 deviceId = it.requestingDeviceId,
                                 requestId = it.requestId,
                                 requestBody = it.body ?: RoomKeyRequestBody(),
-                                localCreationTimestamp = event.ageLocalTs ?: System.currentTimeMillis()
+                                localCreationTimestamp = event.ageLocalTs ?: currentTimeMillis
                         )
                     }
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/IncomingSecretShareRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/IncomingSecretShareRequest.kt
index 5afffef1ae..80f70c83f3 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/IncomingSecretShareRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/model/IncomingSecretShareRequest.kt
@@ -64,8 +64,9 @@ data class IncomingSecretShareRequest(
          * Factory
          *
          * @param event the event
+         * @param currentTimeMillis the current time in milliseconds
          */
-        fun fromEvent(event: Event): IncomingSecretShareRequest? {
+        fun fromEvent(event: Event, currentTimeMillis: Long): IncomingSecretShareRequest? {
             return event.getClearContent()
                     .toModel<SecretShareRequest>()
                     ?.let {
@@ -74,7 +75,7 @@ data class IncomingSecretShareRequest(
                                 deviceId = it.requestingDeviceId,
                                 requestId = it.requestId,
                                 secretName = it.secretName,
-                                localCreationTimestamp = event.ageLocalTs ?: System.currentTimeMillis()
+                                localCreationTimestamp = event.ageLocalTs ?: currentTimeMillis
                         )
                     }
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt
index b9d0c0ad2c..ec67e4b31d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt
@@ -129,11 +129,10 @@ interface VerificationService {
         private const val TEN_MINUTES_IN_MILLIS = 10 * 60 * 1000
         private const val FIVE_MINUTES_IN_MILLIS = 5 * 60 * 1000
 
-        fun isValidRequest(age: Long?): Boolean {
+        fun isValidRequest(age: Long?, currentTimeMillis: Long): Boolean {
             if (age == null) return false
-            val now = System.currentTimeMillis()
-            val tooInThePast = now - TEN_MINUTES_IN_MILLIS
-            val tooInTheFuture = now + FIVE_MINUTES_IN_MILLIS
+            val tooInThePast = currentTimeMillis - TEN_MINUTES_IN_MILLIS
+            val tooInTheFuture = currentTimeMillis + FIVE_MINUTES_IN_MILLIS
             return age in tooInThePast..tooInTheFuture
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt
index 72f8019ada..8e930f2a50 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt
@@ -45,9 +45,9 @@ interface FileService {
      * Result will be a decrypted file, stored in the cache folder. url parameter will be used to create unique filename to avoid name collision.
      */
     suspend fun downloadFile(fileName: String,
-                     mimeType: String?,
-                     url: String?,
-                     elementToDecrypt: ElementToDecrypt?): File
+                             mimeType: String?,
+                             url: String?,
+                             elementToDecrypt: ElementToDecrypt?): File
 
     suspend fun downloadFile(messageContent: MessageWithAttachmentContent): File =
             downloadFile(
@@ -68,7 +68,8 @@ interface FileService {
                     mxcUrl = messageContent.getFileUrl(),
                     fileName = messageContent.getFileName(),
                     mimeType = messageContent.mimeType,
-                    elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt())
+                    elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt()
+            )
 
     /**
      * Use this URI and pass it to intent using flag Intent.FLAG_GRANT_READ_URI_PERMISSION
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
index 9db3876b74..597c1a0ca8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
@@ -54,7 +54,7 @@ data class HomeServerCapabilities(
         /**
          * True if the home server support threading
          */
-        var canUseThreading: Boolean = false
+        val canUseThreading: Boolean = false
 ) {
 
     enum class RoomCapabilitySupport {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/SyncStatusService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/SyncStatusService.kt
index 267436916e..759813939f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/SyncStatusService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/SyncStatusService.kt
@@ -43,6 +43,7 @@ interface SyncStatusService {
                 val rooms: Int,
                 val toDevice: Int
         ) : IncrementalSyncStatus()
+
         object IncrementalSyncError : IncrementalSyncStatus()
         object IncrementalSyncDone : IncrementalSyncStatus()
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixLinkify.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixLinkify.kt
index 3e27da0c41..c5d919407a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixLinkify.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixLinkify.kt
@@ -55,7 +55,7 @@ object MatrixLinkify {
                             MatrixPatterns.isRoomId(url) ||
                             MatrixPatterns.isGroupId(url) ||
                             MatrixPatterns.isEventId(url)) {
-                        url = PermalinkService.MATRIX_TO_URL_BASE  + url
+                        url = PermalinkService.MATRIX_TO_URL_BASE + url
                     }
                     val span = MatrixPermalinkSpan(url, callback)
                     spannable.setSpan(span, startPos, endPos, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkData.kt
index 85291cf0f6..57aacc98b8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkData.kt
@@ -35,21 +35,21 @@ sealed class PermalinkData {
 
     /**
      * &room_name=Team2
-        &room_avatar_url=mxc:
-         &inviter_name=bob
+    &room_avatar_url=mxc:
+    &inviter_name=bob
      */
     @Parcelize
     data class RoomEmailInviteLink(
-        val roomId: String,
-        val email: String,
-        val signUrl: String,
-        val roomName: String?,
-        val roomAvatarUrl: String?,
-        val inviterName: String?,
-        val identityServer: String,
-        val token: String,
-        val privateKey: String,
-        val roomType: String?
+            val roomId: String,
+            val email: String,
+            val signUrl: String,
+            val roomName: String?,
+            val roomAvatarUrl: String?,
+            val inviterName: String?,
+            val identityServer: String,
+            val token: String,
+            val privateKey: String,
+            val roomType: String?
     ) : PermalinkData(), Parcelable
 
     data class UserLink(val userId: String) : PermalinkData()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Action.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/Action.kt
similarity index 97%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Action.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/Action.kt
index 30289531e7..7790942d84 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Action.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/Action.kt
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.matrix.android.sdk.api.pushrules
+package org.matrix.android.sdk.api.session.pushrules
 
-import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
 import timber.log.Timber
 
 sealed class Action {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Condition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/Condition.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Condition.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/Condition.kt
index 04cccf7319..df5b056c2e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Condition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/Condition.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.matrix.android.sdk.api.pushrules
+package org.matrix.android.sdk.api.session.pushrules
 
 import org.matrix.android.sdk.api.session.events.model.Event
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ConditionResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/ConditionResolver.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ConditionResolver.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/ConditionResolver.kt
index 0a7366e5d2..f8a930f987 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ConditionResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/ConditionResolver.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.matrix.android.sdk.api.pushrules
+package org.matrix.android.sdk.api.session.pushrules
 
 import org.matrix.android.sdk.api.session.events.model.Event
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ContainsDisplayNameCondition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/ContainsDisplayNameCondition.kt
similarity index 97%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ContainsDisplayNameCondition.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/ContainsDisplayNameCondition.kt
index 7f43023873..69dd14ddc2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ContainsDisplayNameCondition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/ContainsDisplayNameCondition.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.matrix.android.sdk.api.pushrules
+package org.matrix.android.sdk.api.session.pushrules
 
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/EventMatchCondition.kt
similarity index 98%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/EventMatchCondition.kt
index 65a13b4fec..8875807b8a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/EventMatchCondition.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.matrix.android.sdk.api.pushrules
+package org.matrix.android.sdk.api.session.pushrules
 
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.internal.di.MoshiProvider
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Kind.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/Kind.kt
similarity index 96%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Kind.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/Kind.kt
index 293a06af9f..463f3c2a73 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Kind.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/Kind.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.api.pushrules
+package org.matrix.android.sdk.api.session.pushrules
 
 enum class Kind(val value: String) {
     EventMatch("event_match"),
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushEvents.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/PushEvents.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushEvents.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/PushEvents.kt
index 466e345cad..ee460d7076 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushEvents.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/PushEvents.kt
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.matrix.android.sdk.api.pushrules
+package org.matrix.android.sdk.api.session.pushrules
 
-import org.matrix.android.sdk.api.pushrules.rest.PushRule
 import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
 
 data class PushEvents(
         val matchedEvents: List<Pair<Event, PushRule>>,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/PushRuleService.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/PushRuleService.kt
index 76885d8545..abbdbf8104 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/PushRuleService.kt
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.matrix.android.sdk.api.pushrules
+package org.matrix.android.sdk.api.session.pushrules
 
 import androidx.lifecycle.LiveData
-import org.matrix.android.sdk.api.pushrules.rest.PushRule
-import org.matrix.android.sdk.api.pushrules.rest.RuleSet
 import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.session.pushrules.rest.RuleSet
 
 interface PushRuleService {
     /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RoomMemberCountCondition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/RoomMemberCountCondition.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RoomMemberCountCondition.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/RoomMemberCountCondition.kt
index 328e6dae11..6973ff1372 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RoomMemberCountCondition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/RoomMemberCountCondition.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.matrix.android.sdk.api.pushrules
+package org.matrix.android.sdk.api.session.pushrules
 
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.internal.session.room.RoomGetter
@@ -44,7 +44,7 @@ class RoomMemberCountCondition(
         // Parse the is field into prefix and number the first time
         val (prefix, count) = parseIsField() ?: return false
 
-        val numMembers = room.getNumberOfJoinedMembers()
+        val numMembers = room.membershipService().getNumberOfJoinedMembers()
 
         return when (prefix) {
             "<"  -> numMembers < count
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleIds.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/RuleIds.kt
similarity index 97%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleIds.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/RuleIds.kt
index 5b14e97d5e..4f35fb79c3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleIds.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/RuleIds.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.api.pushrules
+package org.matrix.android.sdk.api.session.pushrules
 
 /**
  * Known rule ids
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleScope.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/RuleScope.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleScope.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/RuleScope.kt
index 7c1edc1aca..307b9db042 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleScope.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/RuleScope.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.matrix.android.sdk.api.pushrules
+package org.matrix.android.sdk.api.session.pushrules
 
 object RuleScope {
     const val GLOBAL = "global"
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleSetKey.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/RuleSetKey.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleSetKey.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/RuleSetKey.kt
index 5b6f6713f8..7b8f4c9f95 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleSetKey.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/RuleSetKey.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.api.pushrules
+package org.matrix.android.sdk.api.session.pushrules
 
 /**
  * Ref: https://matrix.org/docs/spec/client_server/latest#get-matrix-client-r0-pushrules
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/SenderNotificationPermissionCondition.kt
similarity index 97%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/SenderNotificationPermissionCondition.kt
index 6675fb0ff5..82f5023c2f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/SenderNotificationPermissionCondition.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.matrix.android.sdk.api.pushrules
+package org.matrix.android.sdk.api.session.pushrules
 
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushCondition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/rest/PushCondition.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushCondition.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/rest/PushCondition.kt
index b31a1e6343..1fc8329535 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushCondition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/rest/PushCondition.kt
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.matrix.android.sdk.api.pushrules.rest
+package org.matrix.android.sdk.api.session.pushrules.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import org.matrix.android.sdk.api.pushrules.Condition
-import org.matrix.android.sdk.api.pushrules.ContainsDisplayNameCondition
-import org.matrix.android.sdk.api.pushrules.EventMatchCondition
-import org.matrix.android.sdk.api.pushrules.Kind
-import org.matrix.android.sdk.api.pushrules.RoomMemberCountCondition
-import org.matrix.android.sdk.api.pushrules.RuleIds
-import org.matrix.android.sdk.api.pushrules.SenderNotificationPermissionCondition
+import org.matrix.android.sdk.api.session.pushrules.Condition
+import org.matrix.android.sdk.api.session.pushrules.ContainsDisplayNameCondition
+import org.matrix.android.sdk.api.session.pushrules.EventMatchCondition
+import org.matrix.android.sdk.api.session.pushrules.Kind
+import org.matrix.android.sdk.api.session.pushrules.RoomMemberCountCondition
+import org.matrix.android.sdk.api.session.pushrules.RuleIds
+import org.matrix.android.sdk.api.session.pushrules.SenderNotificationPermissionCondition
 import timber.log.Timber
 
 /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/rest/PushRule.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/rest/PushRule.kt
index 31d7770a9f..270ffb2940 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/rest/PushRule.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.api.pushrules.rest
+package org.matrix.android.sdk.api.session.pushrules.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.api.extensions.orFalse
-import org.matrix.android.sdk.api.pushrules.Action
-import org.matrix.android.sdk.api.pushrules.getActions
-import org.matrix.android.sdk.api.pushrules.toJson
+import org.matrix.android.sdk.api.session.pushrules.Action
+import org.matrix.android.sdk.api.session.pushrules.getActions
+import org.matrix.android.sdk.api.session.pushrules.toJson
 
 /**
  * Ref: https://matrix.org/docs/spec/client_server/latest#get-matrix-client-r0-pushrules
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/RuleSet.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/rest/RuleSet.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/RuleSet.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/rest/RuleSet.kt
index 46f5148714..5bf42b8252 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/RuleSet.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushrules/rest/RuleSet.kt
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.matrix.android.sdk.api.pushrules.rest
+package org.matrix.android.sdk.api.session.pushrules.rest
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import org.matrix.android.sdk.api.pushrules.RuleIds
-import org.matrix.android.sdk.api.pushrules.RuleSetKey
+import org.matrix.android.sdk.api.session.pushrules.RuleIds
+import org.matrix.android.sdk.api.session.pushrules.RuleSetKey
 
 /**
  * Ref: https://matrix.org/docs/spec/client_server/latest#get-matrix-client-r0-pushrules
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
index be65b883b3..1f990f4c0a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
@@ -38,33 +38,13 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineService
 import org.matrix.android.sdk.api.session.room.typing.TypingService
 import org.matrix.android.sdk.api.session.room.uploads.UploadsService
 import org.matrix.android.sdk.api.session.room.version.RoomVersionService
-import org.matrix.android.sdk.api.session.search.SearchResult
 import org.matrix.android.sdk.api.session.space.Space
 import org.matrix.android.sdk.api.util.Optional
 
 /**
  * This interface defines methods to interact within a room.
  */
-interface Room :
-        TimelineService,
-        ThreadsService,
-        ThreadsLocalService,
-        SendService,
-        DraftService,
-        ReadService,
-        TypingService,
-        AliasService,
-        TagsService,
-        MembershipService,
-        StateService,
-        UploadsService,
-        ReportingService,
-        RoomCallService,
-        RelationService,
-        RoomCryptoService,
-        RoomPushRuleService,
-        RoomAccountDataService,
-        RoomVersionService {
+interface Room {
 
     val coroutineDispatchers: MatrixCoroutineDispatchers
 
@@ -84,28 +64,103 @@ interface Room :
      */
     fun roomSummary(): RoomSummary?
 
-    /**
-     * Generic function to search a term in a room.
-     * Ref: https://matrix.org/docs/spec/client_server/latest#module-search
-     * @param searchTerm the term to search
-     * @param nextBatch the token that retrieved from the previous response. Should be provided to get the next batch of results
-     * @param orderByRecent if true, the most recent message events will return in the first places of the list
-     * @param limit the maximum number of events to return.
-     * @param beforeLimit how many events before the result are returned.
-     * @param afterLimit how many events after the result are returned.
-     * @param includeProfile requests that the server returns the historic profile information for the users that sent the events that were returned.
-     * @return The search result
-     */
-    suspend fun search(searchTerm: String,
-                       nextBatch: String?,
-                       orderByRecent: Boolean,
-                       limit: Int,
-                       beforeLimit: Int,
-                       afterLimit: Int,
-                       includeProfile: Boolean): SearchResult
-
     /**
      * Use this room as a Space, if the type is correct.
      */
     fun asSpace(): Space?
+
+    /**
+     * Get the TimelineService associated to this Room
+     */
+    fun timelineService(): TimelineService
+
+    /**
+     * Get the ThreadsService associated to this Room
+     */
+    fun threadsService(): ThreadsService
+
+    /**
+     * Get the ThreadsLocalService associated to this Room
+     */
+    fun threadsLocalService(): ThreadsLocalService
+
+    /**
+     * Get the SendService associated to this Room
+     */
+    fun sendService(): SendService
+
+    /**
+     * Get the DraftService associated to this Room
+     */
+    fun draftService(): DraftService
+
+    /**
+     * Get the ReadService associated to this Room
+     */
+    fun readService(): ReadService
+
+    /**
+     * Get the TypingService associated to this Room
+     */
+    fun typingService(): TypingService
+
+    /**
+     * Get the AliasService associated to this Room
+     */
+    fun aliasService(): AliasService
+
+    /**
+     * Get the TagsService associated to this Room
+     */
+    fun tagsService(): TagsService
+
+    /**
+     * Get the MembershipService associated to this Room
+     */
+    fun membershipService(): MembershipService
+
+    /**
+     * Get the StateService associated to this Room
+     */
+    fun stateService(): StateService
+
+    /**
+     * Get the UploadsService associated to this Room
+     */
+    fun uploadsService(): UploadsService
+
+    /**
+     * Get the ReportingService associated to this Room
+     */
+    fun reportingService(): ReportingService
+
+    /**
+     * Get the RoomCallService associated to this Room
+     */
+    fun roomCallService(): RoomCallService
+
+    /**
+     * Get the RelationService associated to this Room
+     */
+    fun relationService(): RelationService
+
+    /**
+     * Get the RoomCryptoService associated to this Room
+     */
+    fun roomCryptoService(): RoomCryptoService
+
+    /**
+     * Get the RoomPushRuleService associated to this Room
+     */
+    fun roomPushRuleService(): RoomPushRuleService
+
+    /**
+     * Get the RoomAccountDataService associated to this Room
+     */
+    fun roomAccountDataService(): RoomAccountDataService
+
+    /**
+     * Get the RoomVersionService associated to this Room
+     */
+    fun roomVersionService(): RoomVersionService
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomExtensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomExtensions.kt
new file mode 100644
index 0000000000..ece9cfbfac
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomExtensions.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.room
+
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+
+/**
+ * Get a TimelineEvent using the TimelineService of a Room
+ */
+fun Room.getTimelineEvent(eventId: String): TimelineEvent? =
+        timelineService().getTimelineEvent(eventId)
+
+/**
+ * Get a StateEvent using the StateService of a Room
+ */
+fun Room.getStateEvent(eventType: String, stateKey: QueryStringValue = QueryStringValue.NoCondition): Event? =
+        stateService().getStateEvent(eventType, stateKey)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EventAnnotationsSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EventAnnotationsSummary.kt
index 0238eb6c8d..0aded20339 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EventAnnotationsSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EventAnnotationsSummary.kt
@@ -15,10 +15,12 @@
  */
 package org.matrix.android.sdk.api.session.room.model
 
+import org.matrix.android.sdk.api.session.room.model.livelocation.LiveLocationShareAggregatedSummary
+
 data class EventAnnotationsSummary(
-        val eventId: String,
         val reactionsSummary: List<ReactionAggregatedSummary> = emptyList(),
         val editSummary: EditAggregatedSummary? = null,
         val pollResponseSummary: PollResponseAggregatedSummary? = null,
-        val referencesAggregatedSummary: ReferencesAggregatedSummary? = null
+        val referencesAggregatedSummary: ReferencesAggregatedSummary? = null,
+        val liveLocationShareAggregatedSummary: LiveLocationShareAggregatedSummary? = null,
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedSummary.kt
index 31ac09efb8..49ba2d5ab6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedSummary.kt
@@ -22,7 +22,6 @@ import org.matrix.android.sdk.api.session.events.model.Content
  * of all events that are referencing the 'eventId' event via the RelationType.REFERENCE
  */
 data class ReferencesAggregatedSummary(
-        val eventId: String,
         val content: Content?,
         val sourceEvents: List<String>,
         val localEchos: List<String>
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
index 871b299f93..5237b10d52 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
@@ -36,10 +36,10 @@ data class RoomJoinRulesContent(
         @Json(name = "allow") val allowList: List<RoomJoinRulesAllowEntry>? = null
 ) {
     val joinRules: RoomJoinRules? = when (_joinRules) {
-        "public" -> RoomJoinRules.PUBLIC
-        "invite" -> RoomJoinRules.INVITE
-        "knock" -> RoomJoinRules.KNOCK
-        "private" -> RoomJoinRules.PRIVATE
+        "public"     -> RoomJoinRules.PUBLIC
+        "invite"     -> RoomJoinRules.INVITE
+        "knock"      -> RoomJoinRules.KNOCK
+        "private"    -> RoomJoinRules.PRIVATE
         "restricted" -> RoomJoinRules.RESTRICTED
         else         -> {
             Timber.w("Invalid value for RoomJoinRules: `$_joinRules`")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallAnswerContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallAnswerContent.kt
index 6b4d782832..67ef85787e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallAnswerContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallAnswerContent.kt
@@ -44,7 +44,7 @@ data class CallAnswerContent(
          * Capability advertisement.
          */
         @Json(name = "capabilities") val capabilities: CallCapabilities? = null
-) : CallSignalingContent  {
+) : CallSignalingContent {
 
     @JsonClass(generateAdapter = true)
     data class Answer(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallInviteContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallInviteContent.kt
index d70e63d122..24c8152f3c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallInviteContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallInviteContent.kt
@@ -55,7 +55,7 @@ data class CallInviteContent(
          */
         @Json(name = "capabilities") val capabilities: CallCapabilities? = null
 
-) : CallSignalingContent  {
+) : CallSignalingContent {
     @JsonClass(generateAdapter = true)
     data class Offer(
             /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallNegotiateContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallNegotiateContent.kt
index bbbfbe68ab..5c6c6cda01 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallNegotiateContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallNegotiateContent.kt
@@ -47,7 +47,7 @@ data class CallNegotiateContent(
          */
         @Json(name = "version") override val version: String?
 
-        ) : CallSignalingContent  {
+) : CallSignalingContent {
     @JsonClass(generateAdapter = true)
     data class Description(
             /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallReplacesContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallReplacesContent.kt
index 7947b7d0bd..e480e013ea 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallReplacesContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallReplacesContent.kt
@@ -61,7 +61,7 @@ data class CallReplacesContent(
          * Required. The version of the VoIP specification this messages adheres to.
          */
         @Json(name = "version") override val version: String?
-) : CallSignalingContent  {
+) : CallSignalingContent {
 
     @JsonClass(generateAdapter = true)
     data class TargetUser(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/LiveLocationShareAggregatedSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/LiveLocationShareAggregatedSummary.kt
new file mode 100644
index 0000000000..0b28d62f56
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/LiveLocationShareAggregatedSummary.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.room.model.livelocation
+
+import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconLocationDataContent
+
+/**
+ * Aggregation info concerning a live location share.
+ */
+data class LiveLocationShareAggregatedSummary(
+        val isActive: Boolean?,
+        val endOfLiveTimestampMillis: Long?,
+        val lastLocationDataContent: MessageBeaconLocationDataContent?,
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/FileInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/FileInfo.kt
index fa18bfd21f..132b72902f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/FileInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/FileInfo.kt
@@ -52,5 +52,5 @@ data class FileInfo(
  * Get the url of the encrypted thumbnail or of the thumbnail
  */
 fun FileInfo.getThumbnailUrl(): String? {
-        return thumbnailFile?.url ?: thumbnailUrl
+    return thumbnailFile?.url ?: thumbnailUrl
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt
index 0099208320..bd99ea6900 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt
@@ -62,5 +62,5 @@ data class ImageInfo(
  * Get the url of the encrypted thumbnail or of the thumbnail
  */
 fun ImageInfo.getThumbnailUrl(): String? {
-        return thumbnailFile?.url ?: thumbnailUrl
+    return thumbnailFile?.url ?: thumbnailUrl
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/LiveLocationBeaconContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageBeaconInfoContent.kt
similarity index 57%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/LiveLocationBeaconContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageBeaconInfoContent.kt
index 106e76eafd..f75704a891 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/LiveLocationBeaconContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageBeaconInfoContent.kt
@@ -14,60 +14,59 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.api.session.room.model.livelocation
+package org.matrix.android.sdk.api.session.room.model.message
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.api.session.events.model.Content
-import org.matrix.android.sdk.api.session.room.model.message.LocationAsset
-import org.matrix.android.sdk.api.session.room.model.message.LocationAssetType
-import org.matrix.android.sdk.api.session.room.model.message.MessageContent
-import org.matrix.android.sdk.api.session.room.model.message.MessageLiveLocationContent
-import org.matrix.android.sdk.api.session.room.model.message.MessageType
 import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
 
+/**
+ * Content of the state event of type
+ * [EventType.STATE_ROOM_BEACON_INFO][org.matrix.android.sdk.api.session.events.model.EventType.STATE_ROOM_BEACON_INFO]
+ *
+ * It contains general info related to a live location share.
+ * Locations are sent in a different message related to the state event.
+ * See [MessageBeaconLocationDataContent][org.matrix.android.sdk.api.session.room.model.message.MessageBeaconLocationDataContent]
+ */
 @JsonClass(generateAdapter = true)
-data class LiveLocationBeaconContent(
+data class MessageBeaconInfoContent(
         /**
          * Local message type, not from server
          */
         @Transient
-        override val msgType: String = MessageType.MSGTYPE_LIVE_LOCATION_STATE,
+        override val msgType: String = MessageType.MSGTYPE_BEACON_INFO,
 
         @Json(name = "body") override val body: String = "",
         @Json(name = "m.relates_to") override val relatesTo: RelationDefaultContent? = null,
         @Json(name = "m.new_content") override val newContent: Content? = null,
 
         /**
-         * Indicates user's intent to share ephemeral location.
+         * Optional description of the beacon.
          */
-        @Json(name = "org.matrix.msc3672.beacon_info") val unstableBeaconInfo: BeaconInfo? = null,
-        @Json(name = "m.beacon_info") val beaconInfo: BeaconInfo? = null,
+        @Json(name = "description") val description: String? = null,
+        /**
+         * Beacon should be considered as inactive after this timeout as milliseconds.
+         */
+        @Json(name = "timeout") val timeout: Long? = null,
+        /**
+         * Should be set true to start sharing beacon.
+         */
+        @Json(name = "live") val isLive: Boolean? = null,
+
         /**
          * Beacon creation timestamp.
          */
-        @Json(name = "org.matrix.msc3488.ts") val unstableTimestampAsMilliseconds: Long? = null,
-        @Json(name = "m.ts") val timestampAsMilliseconds: Long? = null,
+        @Json(name = "org.matrix.msc3488.ts") val unstableTimestampMillis: Long? = null,
+        @Json(name = "m.ts") val timestampMillis: Long? = null,
         /**
          * Live location asset type.
          */
         @Json(name = "org.matrix.msc3488.asset") val unstableLocationAsset: LocationAsset = LocationAsset(LocationAssetType.SELF),
         @Json(name = "m.asset") val locationAsset: LocationAsset? = null,
-
-        /**
-         * Client side tracking of the last location
-         */
-        var lastLocationContent: MessageLiveLocationContent? = null,
-
-        /**
-         * Client side tracking of whether the beacon has timed out.
-         */
-        var hasTimedOut: Boolean = false
 ) : MessageContent {
 
-    fun getBestBeaconInfo() = beaconInfo ?: unstableBeaconInfo
-
-    fun getBestTimestampAsMilliseconds() = timestampAsMilliseconds ?: unstableTimestampAsMilliseconds
+    fun getBestTimestampMillis() = timestampMillis ?: unstableTimestampMillis
 
     fun getBestLocationAsset() = locationAsset ?: unstableLocationAsset
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLiveLocationContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageBeaconLocationDataContent.kt
similarity index 72%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLiveLocationContent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageBeaconLocationDataContent.kt
index 548dc85369..4a4ef46bc8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLiveLocationContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageBeaconLocationDataContent.kt
@@ -21,13 +21,21 @@ import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
 
+/**
+ * Content of the state event of type
+ * [EventType.BEACON_LOCATION_DATA][org.matrix.android.sdk.api.session.events.model.EventType.BEACON_LOCATION_DATA]
+ *
+ * It contains location data related to a live location share.
+ * It is related to the state event that originally started the live.
+ * See [MessageBeaconInfoContent][org.matrix.android.sdk.api.session.room.model.message.MessageBeaconInfoContent]
+ */
 @JsonClass(generateAdapter = true)
-data class MessageLiveLocationContent(
+data class MessageBeaconLocationDataContent(
         /**
          * Local message type, not from server
          */
         @Transient
-        override val msgType: String = MessageType.MSGTYPE_LIVE_LOCATION,
+        override val msgType: String = MessageType.MSGTYPE_BEACON_LOCATION_DATA,
 
         @Json(name = "body") override val body: String = "",
         @Json(name = "m.relates_to") override val relatesTo: RelationDefaultContent? = null,
@@ -42,11 +50,11 @@ data class MessageLiveLocationContent(
         /**
          * Exact time that the data in the event refers to (milliseconds since the UNIX epoch)
          */
-        @Json(name = "org.matrix.msc3488.ts") val unstableTimestampAsMilliseconds: Long? = null,
-        @Json(name = "m.ts") val timestampAsMilliseconds: Long? = null
+        @Json(name = "org.matrix.msc3488.ts") val unstableTimestampMillis: Long? = null,
+        @Json(name = "m.ts") val timestampMillis: Long? = null
 ) : MessageContent {
 
     fun getBestLocationInfo() = locationInfo ?: unstableLocationInfo
 
-    fun getBestTimestampAsMilliseconds() = timestampAsMilliseconds ?: unstableTimestampAsMilliseconds
+    fun getBestTimestampMillis() = timestampMillis ?: unstableTimestampMillis
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLocationContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLocationContent.kt
index 2052133b06..19cb20430d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLocationContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLocationContent.kt
@@ -49,8 +49,8 @@ data class MessageLocationContent(
         /**
          * Exact time that the data in the event refers to (milliseconds since the UNIX epoch)
          */
-        @Json(name = "org.matrix.msc3488.ts") val unstableTs: Long? = null,
-        @Json(name = "m.ts") val ts: Long? = null,
+        @Json(name = "org.matrix.msc3488.ts") val unstableTimestampMillis: Long? = null,
+        @Json(name = "m.ts") val timestampMillis: Long? = null,
         @Json(name = "org.matrix.msc1767.text") val unstableText: String? = null,
         @Json(name = "m.text") val text: String? = null,
         /**
@@ -66,7 +66,7 @@ data class MessageLocationContent(
 
     fun getBestLocationInfo() = locationInfo ?: unstableLocationInfo
 
-    fun getBestTs() = ts ?: unstableTs
+    fun getBestTimestampMillis() = timestampMillis ?: unstableTimestampMillis
 
     fun getBestText() = text ?: unstableText
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt
index 106bf2e030..b12d9ed6c8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt
@@ -41,6 +41,6 @@ object MessageType {
     const val MSGTYPE_SNOWFALL = "io.element.effect.snowfall"
 
     // Fake message types for live location events to be able to inherit them from MessageContent
-    const val MSGTYPE_LIVE_LOCATION_STATE = "org.matrix.android.sdk.livelocation.state"
-    const val MSGTYPE_LIVE_LOCATION = "org.matrix.android.sdk.livelocation"
+    const val MSGTYPE_BEACON_INFO = "org.matrix.android.sdk.beacon.info"
+    const val MSGTYPE_BEACON_LOCATION_DATA = "org.matrix.android.sdk.beacon.location.data"
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationRequestContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationRequestContent.kt
index b2b3cdac90..a0699831f7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationRequestContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationRequestContent.kt
@@ -24,7 +24,7 @@ import org.matrix.android.sdk.internal.crypto.verification.VerificationInfoReque
 
 @JsonClass(generateAdapter = true)
 data class MessageVerificationRequestContent(
-        @Json(name = MessageContent.MSG_TYPE_JSON_KEY)override val msgType: String = MessageType.MSGTYPE_VERIFICATION_REQUEST,
+        @Json(name = MessageContent.MSG_TYPE_JSON_KEY) override val msgType: String = MessageType.MSGTYPE_VERIFICATION_REQUEST,
         @Json(name = "body") override val body: String,
         @Json(name = "from_device") override val fromDevice: String?,
         @Json(name = "methods") override val methods: List<String>,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVideoContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVideoContent.kt
index 9266a0fb0f..9b657971b9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVideoContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVideoContent.kt
@@ -27,7 +27,7 @@ data class MessageVideoContent(
         /**
          * Required. Must be 'm.video'.
          */
-        @Json(name = MessageContent.MSG_TYPE_JSON_KEY)override val msgType: String,
+        @Json(name = MessageContent.MSG_TYPE_JSON_KEY) override val msgType: String,
 
         /**
          * Required. A description of the video e.g. 'Gangnam style', or some kind of content description for accessibility e.g. 'video attachment'.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt
index 28f3a47d11..b02b4d96ad 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt
@@ -67,5 +67,5 @@ data class VideoInfo(
  * Get the url of the encrypted thumbnail or of the thumbnail
  */
 fun VideoInfo.getThumbnailUrl(): String? {
-        return thumbnailFile?.url ?: thumbnailUrl
+    return thumbnailFile?.url ?: thumbnailUrl
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/state/StateService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/state/StateService.kt
index f645f3ebf9..98171795e2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/state/StateService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/state/StateService.kt
@@ -84,8 +84,9 @@ interface StateService {
      * @param eventType The type of event to send.
      * @param stateKey The state_key for the state to send. Can be an empty string.
      * @param body The content object of the event; the fields in this object will vary depending on the type of event
+     * @return the id of the created state event
      */
-    suspend fun sendStateEvent(eventType: String, stateKey: String, body: JsonDict)
+    suspend fun sendStateEvent(eventType: String, stateKey: String, body: JsonDict): String
 
     /**
      * Get a state event of the room
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
index a2ae8bfeb5..adbc8ab12a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
@@ -29,7 +29,7 @@ import org.matrix.android.sdk.api.session.events.model.isSticker
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
 import org.matrix.android.sdk.api.session.room.model.ReadReceipt
-import org.matrix.android.sdk.api.session.room.model.livelocation.LiveLocationBeaconContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconInfoContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.model.message.MessagePollContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageStickerContent
@@ -139,7 +139,7 @@ fun TimelineEvent.getLastMessageContent(): MessageContent? {
     return when (root.getClearType()) {
         EventType.STICKER                   -> root.getClearContent().toModel<MessageStickerContent>()
         in EventType.POLL_START             -> (annotations?.editSummary?.latestContent ?: root.getClearContent()).toModel<MessagePollContent>()
-        in EventType.STATE_ROOM_BEACON_INFO -> (annotations?.editSummary?.latestContent ?: root.getClearContent()).toModel<LiveLocationBeaconContent>()
+        in EventType.STATE_ROOM_BEACON_INFO -> (annotations?.editSummary?.latestContent ?: root.getClearContent()).toModel<MessageBeaconInfoContent>()
         else                                -> (annotations?.editSummary?.latestContent ?: root.getClearContent()).toModel()
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEventFilters.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEventFilters.kt
index 4415c8e4b3..a35a291d9b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEventFilters.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEventFilters.kt
@@ -16,6 +16,7 @@
 
 package org.matrix.android.sdk.api.session.room.timeline
 
+// TODO Move to internal, strange?
 data class TimelineEventFilters(
         /**
          * A flag to filter edit events
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt
index 6548453c8a..b45f3ecb71 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt
@@ -31,7 +31,8 @@ data class TimelineSettings(
         /**
          * The root thread eventId if this is a thread timeline, or null if this is NOT a thread timeline
          */
-        val rootThreadEventId: String? = null) {
+        val rootThreadEventId: String? = null,
+) {
 
     /**
      * Returns true if this is a thread timeline or false otherwise
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageError.kt
index a91b97b86c..038533c19e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageError.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageError.kt
@@ -23,7 +23,7 @@ sealed class SharedSecretStorageError(message: String?) : Throwable(message) {
     data class UnsupportedAlgorithm(val algorithm: String) : SharedSecretStorageError("Unknown algorithm $algorithm")
     data class SecretNotEncrypted(val secretName: String) : SharedSecretStorageError("Missing content for secret $secretName")
     data class SecretNotEncryptedWithKey(val secretName: String, val keyId: String) :
-        SharedSecretStorageError("Missing content for secret $secretName with key $keyId")
+            SharedSecretStorageError("Missing content for secret $secretName with key $keyId")
 
     object BadKeyFormat : SharedSecretStorageError("Bad Key Format")
     object ParsingError : SharedSecretStorageError("parsing Error")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
index f4460b7659..afd26f7be5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
@@ -68,7 +68,7 @@ interface SpaceService {
                                    suggestedOnly: Boolean? = null,
                                    limit: Int? = null,
                                    from: String? = null,
-                                   // when paginating, pass back the m.space.child state events
+            // when paginating, pass back the m.space.child state events
                                    knownStateList: List<Event>? = null): SpaceHierarchyData
 
     /**
@@ -106,5 +106,8 @@ interface SpaceService {
 
     suspend fun removeSpaceParent(childRoomId: String, parentSpaceId: String)
 
-    fun getRootSpaceSummaries(): List<RoomSummary>
+    /**
+     * Get the root spaces, i.e. all the spaces which do not have a parent space.
+     */
+    suspend fun getRootSpaceSummaries(): List<RoomSummary>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/uia/UiaResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/uia/UiaResult.kt
new file mode 100644
index 0000000000..ee4a180dea
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/uia/UiaResult.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.uia
+
+enum class UiaResult {
+    SUCCESS,
+    FAILURE,
+    CANCELLED
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/uia/exceptions/UiaCancelledException.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/uia/exceptions/UiaCancelledException.kt
new file mode 100644
index 0000000000..d5f9d72efe
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/uia/exceptions/UiaCancelledException.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.uia.exceptions
+
+class UiaCancelledException(message: String? = null) : Exception(message)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
index 554e21ce55..ebad859b05 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
@@ -26,6 +26,7 @@ import org.matrix.android.sdk.internal.auth.data.WebClientConfig
 import org.matrix.android.sdk.internal.auth.login.ResetPasswordMailConfirmed
 import org.matrix.android.sdk.internal.auth.registration.AddThreePidRegistrationParams
 import org.matrix.android.sdk.internal.auth.registration.AddThreePidRegistrationResponse
+import org.matrix.android.sdk.internal.auth.registration.RegistrationCustomParams
 import org.matrix.android.sdk.internal.auth.registration.RegistrationParams
 import org.matrix.android.sdk.internal.auth.registration.SuccessResult
 import org.matrix.android.sdk.internal.auth.registration.ValidationCodeBody
@@ -68,6 +69,14 @@ internal interface AuthAPI {
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "register")
     suspend fun register(@Body registrationParams: RegistrationParams): Credentials
 
+    /**
+     * Register to the homeserver, or get error 401 with a RegistrationFlowResponse object if registration is incomplete
+     * method to perform other custom stages
+     * Ref: https://matrix.org/docs/spec/client_server/latest#account-registration-and-management
+     */
+    @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "register")
+    suspend fun registerCustom(@Body registrationCustomParams: RegistrationCustomParams): Credentials
+
     /**
      * Checks to see if a username is available, and valid, for the server.
      */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
index 8784d85c10..f1cfe3fee5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
@@ -379,24 +379,33 @@ internal class DefaultAuthenticationService @Inject constructor(
             throw MatrixIdFailure.InvalidMatrixId
         }
 
-        return getWellknownTask.execute(GetWellknownTask.Params(
-                domain = matrixId.getDomain(),
-                homeServerConnectionConfig = homeServerConnectionConfig)
+        return getWellknownTask.execute(
+                GetWellknownTask.Params(
+                        domain = matrixId.getDomain(),
+                        homeServerConnectionConfig = homeServerConnectionConfig.orWellKnownDefaults()
+                )
         )
     }
 
+    private fun HomeServerConnectionConfig?.orWellKnownDefaults() = this ?: HomeServerConnectionConfig.Builder()
+            // server uri is ignored when doing a wellknown lookup as we use the matrix id domain instead
+            .withHomeServerUri("https://dummy.org")
+            .build()
+
     override suspend fun directAuthentication(homeServerConnectionConfig: HomeServerConnectionConfig,
                                               matrixId: String,
                                               password: String,
                                               initialDeviceName: String,
                                               deviceId: String?): Session {
-        return directLoginTask.execute(DirectLoginTask.Params(
-                homeServerConnectionConfig = homeServerConnectionConfig,
-                userId = matrixId,
-                password = password,
-                deviceName = initialDeviceName,
-                deviceId = deviceId
-        ))
+        return directLoginTask.execute(
+                DirectLoginTask.Params(
+                        homeServerConnectionConfig = homeServerConnectionConfig,
+                        userId = matrixId,
+                        password = password,
+                        deviceName = initialDeviceName,
+                        deviceId = deviceId
+                )
+        )
     }
 
     private fun buildAuthAPI(homeServerConnectionConfig: HomeServerConnectionConfig): AuthAPI {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmModule.kt
index a92384b4ed..08d683af7f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmModule.kt
@@ -21,9 +21,11 @@ import io.realm.annotations.RealmModule
 /**
  * Realm module for authentication classes
  */
-@RealmModule(library = true,
+@RealmModule(
+        library = true,
         classes = [
             SessionParamsEntity::class,
             PendingSessionEntity::class
-        ])
+        ]
+)
 internal class AuthRealmModule
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionMapper.kt
index 8e4043c11b..1296ea7cc4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionMapper.kt
@@ -44,7 +44,8 @@ internal class PendingSessionMapper @Inject constructor(moshi: Moshi) {
                 resetPasswordData = resetPasswordData,
                 currentSession = entity.currentSession,
                 isRegistrationStarted = entity.isRegistrationStarted,
-                currentThreePidData = threePidData)
+                currentThreePidData = threePidData
+        )
     }
 
     fun map(sessionData: PendingSessionData?): PendingSessionEntity? {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsMapper.kt
index 147c0e8be0..86929b1afe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsMapper.kt
@@ -54,6 +54,7 @@ internal class SessionParamsMapper @Inject constructor(moshi: Moshi) {
                 sessionParams.userId,
                 credentialsJson,
                 homeServerConnectionConfigJson,
-                sessionParams.isTokenValid)
+                sessionParams.isTokenValid
+        )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
index 4a156e74cd..890cb68aad 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
@@ -17,6 +17,7 @@
 package org.matrix.android.sdk.internal.auth.registration
 
 import kotlinx.coroutines.delay
+import org.matrix.android.sdk.api.auth.data.Credentials
 import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
 import org.matrix.android.sdk.api.auth.registration.RegistrationAvailability
@@ -25,6 +26,7 @@ import org.matrix.android.sdk.api.auth.registration.RegistrationWizard
 import org.matrix.android.sdk.api.auth.registration.toFlowResult
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.Failure.RegistrationFlowError
+import org.matrix.android.sdk.api.util.JsonDict
 import org.matrix.android.sdk.internal.auth.AuthAPI
 import org.matrix.android.sdk.internal.auth.PendingSessionStore
 import org.matrix.android.sdk.internal.auth.SessionCreator
@@ -45,6 +47,7 @@ internal class DefaultRegistrationWizard(
     private val registerAvailableTask: RegisterAvailableTask = DefaultRegisterAvailableTask(authAPI)
     private val registerAddThreePidTask: RegisterAddThreePidTask = DefaultRegisterAddThreePidTask(authAPI)
     private val validateCodeTask: ValidateCodeTask = DefaultValidateCodeTask(authAPI)
+    private val registerCustomTask: RegisterCustomTask = DefaultRegisterCustomTask(authAPI)
 
     override val currentThreePid: String?
         get() {
@@ -117,21 +120,25 @@ internal class DefaultRegistrationWizard(
                 RegisterAddThreePidTask.Params(
                         threePid,
                         pendingSessionData.clientSecret,
-                        pendingSessionData.sendAttempt))
+                        pendingSessionData.sendAttempt
+                )
+        )
 
         pendingSessionData = pendingSessionData.copy(sendAttempt = pendingSessionData.sendAttempt + 1)
                 .also { pendingSessionStore.savePendingSessionData(it) }
 
         val params = RegistrationParams(
                 auth = if (threePid is RegisterThreePid.Email) {
-                    AuthParams.createForEmailIdentity(safeSession,
+                    AuthParams.createForEmailIdentity(
+                            safeSession,
                             ThreePidCredentials(
                                     clientSecret = pendingSessionData.clientSecret,
                                     sid = response.sid
                             )
                     )
                 } else {
-                    AuthParams.createForMsisdnIdentity(safeSession,
+                    AuthParams.createForMsisdnIdentity(
+                            safeSession,
                             ThreePidCredentials(
                                     clientSecret = pendingSessionData.clientSecret,
                                     sid = response.sid
@@ -187,22 +194,51 @@ internal class DefaultRegistrationWizard(
         return performRegistrationRequest(params)
     }
 
-    private suspend fun performRegistrationRequest(registrationParams: RegistrationParams,
-                                                   delayMillis: Long = 0): RegistrationResult {
+    override suspend fun registrationCustom(
+            authParams: JsonDict
+    ): RegistrationResult {
+        val safeSession = pendingSessionData.currentSession
+                ?: throw IllegalStateException("developer error, call createAccount() method first")
+
+        val mutableParams = authParams.toMutableMap()
+        mutableParams["session"] = safeSession
+
+        val params = RegistrationCustomParams(auth = mutableParams)
+        return performRegistrationOtherRequest(params)
+    }
+
+    private suspend fun performRegistrationRequest(
+            registrationParams: RegistrationParams,
+            delayMillis: Long = 0
+    ): RegistrationResult {
         delay(delayMillis)
+        return register { registerTask.execute(RegisterTask.Params(registrationParams)) }
+    }
+
+    private suspend fun performRegistrationOtherRequest(
+            registrationCustomParams: RegistrationCustomParams
+    ): RegistrationResult {
+        return register { registerCustomTask.execute(RegisterCustomTask.Params(registrationCustomParams)) }
+    }
+
+    private suspend fun register(
+            execute: suspend () -> Credentials
+    ): RegistrationResult {
         val credentials = try {
-            registerTask.execute(RegisterTask.Params(registrationParams))
+            execute.invoke()
         } catch (exception: Throwable) {
             if (exception is RegistrationFlowError) {
-                pendingSessionData = pendingSessionData.copy(currentSession = exception.registrationFlowResponse.session)
-                        .also { pendingSessionStore.savePendingSessionData(it) }
+                pendingSessionData =
+                        pendingSessionData.copy(currentSession = exception.registrationFlowResponse.session)
+                                .also { pendingSessionStore.savePendingSessionData(it) }
                 return RegistrationResult.FlowResponse(exception.registrationFlowResponse.toFlowResult())
             } else {
                 throw exception
             }
         }
 
-        val session = sessionCreator.createSession(credentials, pendingSessionData.homeServerConnectionConfig)
+        val session =
+                sessionCreator.createSession(credentials, pendingSessionData.homeServerConnectionConfig)
         return RegistrationResult.Success(session)
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterCustomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterCustomTask.kt
new file mode 100644
index 0000000000..60af708c38
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterCustomTask.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.auth.registration
+
+import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.toRegistrationFlowResponse
+import org.matrix.android.sdk.internal.auth.AuthAPI
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
+
+internal interface RegisterCustomTask : Task<RegisterCustomTask.Params, Credentials> {
+    data class Params(
+            val registrationCustomParams: RegistrationCustomParams
+    )
+}
+
+internal class DefaultRegisterCustomTask(
+        private val authAPI: AuthAPI
+) : RegisterCustomTask {
+
+    override suspend fun execute(params: RegisterCustomTask.Params): Credentials {
+        try {
+            return executeRequest(null) {
+                authAPI.registerCustom(params.registrationCustomParams)
+            }
+        } catch (throwable: Throwable) {
+            throw throwable.toRegistrationFlowResponse()
+                    ?.let { Failure.RegistrationFlowError(it) }
+                    ?: throwable
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/BeaconInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationCustomParams.kt
similarity index 56%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/BeaconInfo.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationCustomParams.kt
index 873edc0f1f..45adac6c26 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/livelocation/BeaconInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationCustomParams.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Matrix.org Foundation C.I.C.
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +14,18 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.api.session.room.model.livelocation
+package org.matrix.android.sdk.internal.auth.registration
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import org.matrix.android.sdk.api.util.JsonDict
 
+/**
+ * Class to pass parameters to the custom registration types for /register.
+ */
 @JsonClass(generateAdapter = true)
-data class BeaconInfo(
-        @Json(name = "description") val description: String? = null,
-        /**
-         * Beacon should be considered as inactive after this timeout as milliseconds.
-         */
-        @Json(name = "timeout") val timeout: Long? = null,
-        /**
-         * Should be set true to start sharing beacon.
-         */
-        @Json(name = "live") val isLive: Boolean? = null
+internal data class RegistrationCustomParams(
+        // authentication parameters
+        @Json(name = "auth")
+        val auth: JsonDict? = null,
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/UIAExt.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/UIAExt.kt
index da0866a5fd..7dafacb3c0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/UIAExt.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/UIAExt.kt
@@ -20,6 +20,8 @@ import org.matrix.android.sdk.api.auth.UIABaseAuth
 import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.toRegistrationFlowResponse
+import org.matrix.android.sdk.api.session.uia.UiaResult
+import org.matrix.android.sdk.api.session.uia.exceptions.UiaCancelledException
 import timber.log.Timber
 import kotlin.coroutines.suspendCoroutine
 
@@ -30,14 +32,15 @@ import kotlin.coroutines.suspendCoroutine
  * @param interceptor see doc in [UserInteractiveAuthInterceptor]
  * @param retryBlock called at the end of the process, in this block generally retry executing the task, with
  * provided authUpdate
- * @return true if UIA is handled without error
+ * @return UiaResult if UIA handled, failed or cancelled
+ *
  */
 internal suspend fun handleUIA(failure: Throwable,
                                interceptor: UserInteractiveAuthInterceptor,
-                               retryBlock: suspend (UIABaseAuth) -> Unit): Boolean {
+                               retryBlock: suspend (UIABaseAuth) -> Unit): UiaResult {
     Timber.d("## UIA: check error ${failure.message}")
     val flowResponse = failure.toRegistrationFlowResponse()
-            ?: return false.also {
+            ?: return UiaResult.FAILURE.also {
                 Timber.d("## UIA: not a UIA error")
             }
 
@@ -50,14 +53,19 @@ internal suspend fun handleUIA(failure: Throwable,
             interceptor.performStage(flowResponse, (failure as? Failure.ServerError)?.error?.code, continuation)
         }
     } catch (failure2: Throwable) {
-        Timber.w(failure2, "## UIA: failed to participate")
-        return false
+        return if (failure2 is UiaCancelledException) {
+            Timber.w(failure2, "## UIA: cancelled")
+            UiaResult.CANCELLED
+        } else {
+            Timber.w(failure2, "## UIA: failed to participate")
+            UiaResult.FAILURE
+        }
     }
 
     Timber.d("## UIA: updated auth")
     return try {
         retryBlock(authUpdate)
-        true
+        UiaResult.SUCCESS
     } catch (failure3: Throwable) {
         handleUIA(failure3, interceptor, retryBlock)
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt
index 98950374ed..aaf23d17b3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt
@@ -32,12 +32,13 @@ import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
 import org.matrix.android.sdk.internal.crypto.tasks.createUniqueTxnId
 import org.matrix.android.sdk.internal.session.SessionComponent
+import org.matrix.android.sdk.internal.util.time.Clock
 import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker
 import org.matrix.android.sdk.internal.worker.SessionWorkerParams
 import javax.inject.Inject
 
 internal class CancelGossipRequestWorker(context: Context, params: WorkerParameters, sessionManager: SessionManager) :
-    SessionSafeCoroutineWorker<CancelGossipRequestWorker.Params>(context, params, sessionManager, Params::class.java) {
+        SessionSafeCoroutineWorker<CancelGossipRequestWorker.Params>(context, params, sessionManager, Params::class.java) {
 
     @JsonClass(generateAdapter = true)
     internal data class Params(
@@ -65,6 +66,7 @@ internal class CancelGossipRequestWorker(context: Context, params: WorkerParamet
     @Inject lateinit var sendToDeviceTask: SendToDeviceTask
     @Inject lateinit var cryptoStore: IMXCryptoStore
     @Inject lateinit var credentials: Credentials
+    @Inject lateinit var clock: Clock
 
     override fun injectWith(injector: SessionComponent) {
         injector.inject(this)
@@ -85,7 +87,7 @@ internal class CancelGossipRequestWorker(context: Context, params: WorkerParamet
                 content = toDeviceContent.toContent(),
                 senderId = credentials.userId
         ).also {
-            it.ageLocalTs = System.currentTimeMillis()
+            it.ageLocalTs = clock.epochMillis()
         })
 
         params.recipients.forEach { userToDeviceMap ->
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoSessionInfoProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoSessionInfoProvider.kt
index 2a58d731e5..73dfc468d9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoSessionInfoProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoSessionInfoProvider.kt
@@ -48,7 +48,7 @@ internal class CryptoSessionInfoProvider @Inject constructor(
     /**
      * @param allActive if true return joined as well as invited, if false, only joined
      */
-     fun getRoomUserIds(roomId: String, allActive: Boolean): List<String> {
+    fun getRoomUserIds(roomId: String, allActive: Boolean): List<String> {
         var userIds: List<String> = emptyList()
         monarchy.doWithRealm { realm ->
             userIds = if (allActive) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index 6a57d94677..8c09da72de 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -103,6 +103,7 @@ import org.matrix.android.sdk.internal.task.TaskThread
 import org.matrix.android.sdk.internal.task.configureWith
 import org.matrix.android.sdk.internal.task.launchToCallback
 import org.matrix.android.sdk.internal.util.JsonCanonicalizer
+import org.matrix.android.sdk.internal.util.time.Clock
 import org.matrix.olm.OlmManager
 import timber.log.Timber
 import java.util.concurrent.atomic.AtomicBoolean
@@ -130,6 +131,7 @@ internal class DefaultCryptoService @Inject constructor(
         private val userId: String,
         @DeviceId
         private val deviceId: String?,
+        private val clock: Clock,
         private val myDeviceInfoHolder: Lazy<MyDeviceInfoHolder>,
         // the crypto store
         private val cryptoStore: IMXCryptoStore,
@@ -701,17 +703,19 @@ internal class DefaultCryptoService @Inject constructor(
             }
             val safeAlgorithm = alg
             if (safeAlgorithm != null) {
-                val t0 = System.currentTimeMillis()
+                val t0 = clock.epochMillis()
                 Timber.tag(loggerTag.value).v("encryptEventContent() starts")
                 runCatching {
                     val content = safeAlgorithm.encryptEventContent(eventContent, eventType, userIds)
-                    Timber.tag(loggerTag.value).v("## CRYPTO | encryptEventContent() : succeeds after ${System.currentTimeMillis() - t0} ms")
+                    Timber.tag(loggerTag.value).v("## CRYPTO | encryptEventContent() : succeeds after ${clock.epochMillis() - t0} ms")
                     MXEncryptEventContentResult(content, EventType.ENCRYPTED)
                 }.foldToCallback(callback)
             } else {
                 val algorithm = getEncryptionAlgorithm(roomId)
-                val reason = String.format(MXCryptoError.UNABLE_TO_ENCRYPT_REASON,
-                        algorithm ?: MXCryptoError.NO_MORE_ALGORITHM_REASON)
+                val reason = String.format(
+                        MXCryptoError.UNABLE_TO_ENCRYPT_REASON,
+                        algorithm ?: MXCryptoError.NO_MORE_ALGORITHM_REASON
+                )
                 Timber.tag(loggerTag.value).e("encryptEventContent() : failed $reason")
                 callback.onFailure(Failure.CryptoError(MXCryptoError.Base(MXCryptoError.ErrorType.UNABLE_TO_ENCRYPT, reason)))
             }
@@ -1022,9 +1026,9 @@ internal class DefaultCryptoService @Inject constructor(
         return withContext(coroutineDispatchers.crypto) {
             Timber.tag(loggerTag.value).v("importRoomKeys starts")
 
-            val t0 = System.currentTimeMillis()
+            val t0 = clock.epochMillis()
             val roomKeys = MXMegolmExportEncryption.decryptMegolmKeyFile(roomKeysAsArray, password)
-            val t1 = System.currentTimeMillis()
+            val t1 = clock.epochMillis()
 
             Timber.tag(loggerTag.value).v("importRoomKeys : decryptMegolmKeyFile done in ${t1 - t0} ms")
 
@@ -1032,7 +1036,7 @@ internal class DefaultCryptoService @Inject constructor(
                     .adapter<List<MegolmSessionData>>(Types.newParameterizedType(List::class.java, MegolmSessionData::class.java))
                     .fromJson(roomKeys)
 
-            val t2 = System.currentTimeMillis()
+            val t2 = clock.epochMillis()
 
             Timber.tag(loggerTag.value).v("importRoomKeys : JSON parsing ${t2 - t1} ms")
 
@@ -1224,7 +1228,7 @@ internal class DefaultCryptoService @Inject constructor(
 //        val deviceKey = deviceInfo.identityKey()
 //
 //        val lastForcedDate = lastNewSessionForcedDates.getObject(senderId, deviceKey) ?: 0
-//        val now = System.currentTimeMillis()
+//        val now = clock.epochMillis()
 //        if (now - lastForcedDate < CRYPTO_MIN_FORCE_SESSION_PERIOD_MILLIS) {
 //            Timber.d("## CRYPTO | markOlmSessionForUnwedging: New session already forced with device at $lastForcedDate. Not forcing another")
 //            return
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
index 6cae2d0935..535999373b 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
@@ -31,19 +31,23 @@ import org.matrix.android.sdk.internal.session.SessionScope
 import org.matrix.android.sdk.internal.session.sync.SyncTokenStore
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.util.logLimit
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 import javax.inject.Inject
 
 // Legacy name: MXDeviceList
 @SessionScope
-internal class DeviceListManager @Inject constructor(private val cryptoStore: IMXCryptoStore,
-                                                     private val olmDevice: MXOlmDevice,
-                                                     private val syncTokenStore: SyncTokenStore,
-                                                     private val credentials: Credentials,
-                                                     private val downloadKeysForUsersTask: DownloadKeysForUsersTask,
-                                                     private val cryptoSessionInfoProvider: CryptoSessionInfoProvider,
-                                                     coroutineDispatchers: MatrixCoroutineDispatchers,
-                                                     private val taskExecutor: TaskExecutor) {
+internal class DeviceListManager @Inject constructor(
+        private val cryptoStore: IMXCryptoStore,
+        private val olmDevice: MXOlmDevice,
+        private val syncTokenStore: SyncTokenStore,
+        private val credentials: Credentials,
+        private val downloadKeysForUsersTask: DownloadKeysForUsersTask,
+        private val cryptoSessionInfoProvider: CryptoSessionInfoProvider,
+        coroutineDispatchers: MatrixCoroutineDispatchers,
+        private val taskExecutor: TaskExecutor,
+        private val clock: Clock,
+) {
 
     interface UserDevicesUpdateListener {
         fun onUsersDeviceUpdate(userIds: List<String>)
@@ -310,9 +314,9 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
             stored
         } else {
             Timber.v("## CRYPTO | downloadKeys() : starts")
-            val t0 = System.currentTimeMillis()
+            val t0 = clock.epochMillis()
             val result = doKeyDownloadForUsers(downloadUsers)
-            Timber.v("## CRYPTO | downloadKeys() : doKeyDownloadForUsers succeeds after ${System.currentTimeMillis() - t0} ms")
+            Timber.v("## CRYPTO | downloadKeys() : doKeyDownloadForUsers succeeds after ${clock.epochMillis() - t0} ms")
             result.also {
                 it.addEntriesFromMap(stored)
             }
@@ -475,8 +479,10 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
         }
 
         if (!isVerified) {
-            Timber.e("## CRYPTO | validateDeviceKeys() : Unable to verify signature on device " + userId + ":" +
-                    deviceKeys.deviceId + " with error " + errorMessage)
+            Timber.e(
+                    "## CRYPTO | validateDeviceKeys() : Unable to verify signature on device " + userId + ":" +
+                            deviceKeys.deviceId + " with error " + errorMessage
+            )
             return false
         }
 
@@ -486,9 +492,11 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
                 // best off sticking with the original keys.
                 //
                 // Should we warn the user about it somehow?
-                Timber.e("## CRYPTO | validateDeviceKeys() : WARNING:Ed25519 key for device " + userId + ":" +
-                        deviceKeys.deviceId + " has changed : " +
-                        previouslyStoredDeviceKeys.fingerprint() + " -> " + signKey)
+                Timber.e(
+                        "## CRYPTO | validateDeviceKeys() : WARNING:Ed25519 key for device " + userId + ":" +
+                                deviceKeys.deviceId + " has changed : " +
+                                previouslyStoredDeviceKeys.fingerprint() + " -> " + signKey
+                )
 
                 Timber.e("## CRYPTO | validateDeviceKeys() : $previouslyStoredDeviceKeys -> $deviceKeys")
                 Timber.e("## CRYPTO | validateDeviceKeys() : ${previouslyStoredDeviceKeys.keys} -> ${deviceKeys.keys}")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt
index 1c8bce7377..a094189645 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt
@@ -36,6 +36,7 @@ import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
 import org.matrix.android.sdk.internal.extensions.foldToCallback
 import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -47,6 +48,7 @@ private val loggerTag = LoggerTag("CryptoSyncHandler", LoggerTag.CRYPTO)
 internal class EventDecryptor @Inject constructor(
         private val cryptoCoroutineScope: CoroutineScope,
         private val coroutineDispatchers: MatrixCoroutineDispatchers,
+        private val clock: Clock,
         private val roomDecryptorProvider: RoomDecryptorProvider,
         private val messageEncrypter: MessageEncrypter,
         private val sendToDeviceTask: SendToDeviceTask,
@@ -153,7 +155,7 @@ internal class EventDecryptor @Inject constructor(
         // we should force start a new session for those
         Timber.tag(loggerTag.value).v("Unwedging:  ${wedgedDevices.size} are wedged")
         // get the one that should be retried according to rate limit
-        val now = System.currentTimeMillis()
+        val now = clock.epochMillis()
         val toUnwedge = wedgedDevices.filter {
             val lastForcedDate = lastNewSessionForcedDates[it] ?: 0
             if (now - lastForcedDate < DefaultCryptoService.CRYPTO_MIN_FORCE_SESSION_PERIOD_MILLIS) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingWorkManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingWorkManager.kt
index 0013c31eea..a2c85e5ceb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingWorkManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingWorkManager.kt
@@ -26,6 +26,7 @@ import org.matrix.android.sdk.internal.di.WorkManagerProvider
 import org.matrix.android.sdk.internal.session.SessionScope
 import org.matrix.android.sdk.internal.util.CancelableWork
 import org.matrix.android.sdk.internal.worker.startChain
+import java.util.UUID
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
@@ -44,8 +45,8 @@ internal class GossipingWorkManager @Inject constructor(
     }
 
     // Prevent sending queue to stay broken after app restart
-    // The unique queue id will stay the same as long as this object is instanciated
-    val queueSuffixApp = System.currentTimeMillis()
+    // The unique queue id will stay the same as long as this object is instantiated
+    private val queueSuffixApp = UUID.randomUUID()
 
     fun postWork(workRequest: OneTimeWorkRequest, policy: ExistingWorkPolicy = ExistingWorkPolicy.APPEND): Cancelable {
         workManagerProvider.workManager
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/InboundGroupSessionStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/InboundGroupSessionStore.kt
index a78444dff9..28ddf291b2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/InboundGroupSessionStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/InboundGroupSessionStore.kt
@@ -75,15 +75,15 @@ internal class InboundGroupSessionStore @Inject constructor(
 
     @Synchronized
     fun getInboundGroupSession(sessionId: String, senderKey: String): InboundGroupSessionHolder? {
-            val known = sessionCache[CacheKey(sessionId, senderKey)]
-            Timber.tag(loggerTag.value).v("## Inbound: getInboundGroupSession  $sessionId in cache ${known != null}")
-            return known
-                    ?: store.getInboundGroupSession(sessionId, senderKey)?.also {
-                Timber.tag(loggerTag.value).v("## Inbound: getInboundGroupSession cache populate ${it.roomId}")
-                sessionCache.put(CacheKey(sessionId, senderKey), InboundGroupSessionHolder(it))
-            }?.let {
-                InboundGroupSessionHolder(it)
-            }
+        val known = sessionCache[CacheKey(sessionId, senderKey)]
+        Timber.tag(loggerTag.value).v("## Inbound: getInboundGroupSession  $sessionId in cache ${known != null}")
+        return known
+                ?: store.getInboundGroupSession(sessionId, senderKey)?.also {
+                    Timber.tag(loggerTag.value).v("## Inbound: getInboundGroupSession cache populate ${it.roomId}")
+                    sessionCache.put(CacheKey(sessionId, senderKey), InboundGroupSessionHolder(it))
+                }?.let {
+                    InboundGroupSessionHolder(it)
+                }
     }
 
     @Synchronized
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt
index 3a409cf3fd..1612caba9f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt
@@ -44,6 +44,7 @@ import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import org.matrix.android.sdk.internal.crypto.tasks.createUniqueTxnId
 import org.matrix.android.sdk.internal.di.SessionId
 import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.util.time.Clock
 import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
 import timber.log.Timber
 import java.util.concurrent.Executors
@@ -59,7 +60,9 @@ internal class IncomingGossipingRequestManager @Inject constructor(
         private val roomEncryptorsStore: RoomEncryptorsStore,
         private val roomDecryptorProvider: RoomDecryptorProvider,
         private val coroutineDispatchers: MatrixCoroutineDispatchers,
-        private val cryptoCoroutineScope: CoroutineScope) {
+        private val cryptoCoroutineScope: CoroutineScope,
+        private val clock: Clock,
+) {
 
     private val executor = Executors.newSingleThreadExecutor()
 
@@ -89,7 +92,7 @@ internal class IncomingGossipingRequestManager @Inject constructor(
     fun onVerificationCompleteForDevice(deviceId: String) {
         // For now we just keep an in memory cache
         synchronized(recentlyVerifiedDevices) {
-            recentlyVerifiedDevices[deviceId] = System.currentTimeMillis()
+            recentlyVerifiedDevices[deviceId] = clock.epochMillis()
         }
     }
 
@@ -100,7 +103,7 @@ internal class IncomingGossipingRequestManager @Inject constructor(
         }
         if (verifTimestamp == null) return false
 
-        val age = System.currentTimeMillis() - verifTimestamp
+        val age = clock.epochMillis() - verifTimestamp
 
         return age < FIVE_MINUTES_IN_MILLIS
     }
@@ -114,11 +117,11 @@ internal class IncomingGossipingRequestManager @Inject constructor(
     fun onGossipingRequestEvent(event: Event) {
         val roomKeyShare = event.getClearContent().toModel<GossipingDefaultContent>()
         Timber.i("## CRYPTO | GOSSIP onGossipingRequestEvent received type ${event.type} from user:${event.senderId}, content:$roomKeyShare")
-        // val ageLocalTs = event.unsignedData?.age?.let { System.currentTimeMillis() - it }
+        // val ageLocalTs = event.unsignedData?.age?.let { clock.epochMillis() - it }
         when (roomKeyShare?.action) {
-            GossipingToDeviceObject.ACTION_SHARE_REQUEST -> {
+            GossipingToDeviceObject.ACTION_SHARE_REQUEST      -> {
                 if (event.getClearType() == EventType.REQUEST_SECRET) {
-                    IncomingSecretShareRequest.fromEvent(event)?.let {
+                    IncomingSecretShareRequest.fromEvent(event, clock.epochMillis())?.let {
                         if (event.senderId == credentials.userId && it.deviceId == credentials.deviceId) {
                             // ignore, it was sent by me as *
                             Timber.v("## GOSSIP onGossipingRequestEvent type ${event.type} ignore remote echo")
@@ -129,7 +132,7 @@ internal class IncomingGossipingRequestManager @Inject constructor(
                         }
                     }
                 } else if (event.getClearType() == EventType.ROOM_KEY_REQUEST) {
-                    IncomingRoomKeyRequest.fromEvent(event)?.let {
+                    IncomingRoomKeyRequest.fromEvent(event, clock.epochMillis())?.let {
                         if (event.senderId == credentials.userId && it.deviceId == credentials.deviceId) {
                             // ignore, it was sent by me as *
                             Timber.v("## GOSSIP onGossipingRequestEvent type ${event.type} ignore remote echo")
@@ -141,7 +144,7 @@ internal class IncomingGossipingRequestManager @Inject constructor(
                 }
             }
             GossipingToDeviceObject.ACTION_SHARE_CANCELLATION -> {
-                IncomingRequestCancellation.fromEvent(event)?.let {
+                IncomingRequestCancellation.fromEvent(event, clock.epochMillis())?.let {
                     receivedRequestCancellations.add(it)
                 }
             }
@@ -346,7 +349,7 @@ internal class IncomingGossipingRequestManager @Inject constructor(
         val isDeviceLocallyVerified = cryptoStore.getUserDevice(userId, deviceId)?.trustLevel?.isLocallyVerified()
 
         when (secretName) {
-            MASTER_KEY_SSSS_NAME -> cryptoStore.getCrossSigningPrivateKeys()?.master
+            MASTER_KEY_SSSS_NAME       -> cryptoStore.getCrossSigningPrivateKeys()?.master
             SELF_SIGNING_KEY_SSSS_NAME -> cryptoStore.getCrossSigningPrivateKeys()?.selfSigned
             USER_SIGNING_KEY_SSSS_NAME -> cryptoStore.getCrossSigningPrivateKeys()?.user
             KEYBACKUP_SECRET_SSSS_NAME -> cryptoStore.getKeyBackupRecoveryKeyInfo()?.recoveryKey
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXMegolmExportEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXMegolmExportEncryption.kt
index f8235bf344..89e38cb7cf 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXMegolmExportEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXMegolmExportEncryption.kt
@@ -29,6 +29,7 @@ import javax.crypto.spec.SecretKeySpec
 import kotlin.experimental.and
 import kotlin.experimental.xor
 import kotlin.math.min
+import kotlin.system.measureTimeMillis
 
 /**
  * Utility class to import/export the crypto data
@@ -310,40 +311,40 @@ internal object MXMegolmExportEncryption {
      */
     @Throws(Exception::class)
     private fun deriveKeys(salt: ByteArray, iterations: Int, password: String): ByteArray {
-        val t0 = System.currentTimeMillis()
-
-        // based on https://en.wikipedia.org/wiki/PBKDF2 algorithm
-        // it is simpler than the generic algorithm because the expected key length is equal to the mac key length.
-        // noticed as dklen/hlen
-        val prf = Mac.getInstance("HmacSHA512")
-        prf.init(SecretKeySpec(password.toByteArray(Charsets.UTF_8), "HmacSHA512"))
-
-        // 512 bits key length
         val key = ByteArray(64)
-        val uc = ByteArray(64)
+        measureTimeMillis {
+            // based on https://en.wikipedia.org/wiki/PBKDF2 algorithm
+            // it is simpler than the generic algorithm because the expected key length is equal to the mac key length.
+            // noticed as dklen/hlen
+            val prf = Mac.getInstance("HmacSHA512")
+            prf.init(SecretKeySpec(password.toByteArray(Charsets.UTF_8), "HmacSHA512"))
 
-        // U1 = PRF(Password, Salt || INT_32_BE(i))
-        prf.update(salt)
-        val int32BE = ByteArray(4) { 0.toByte() }
-        int32BE[3] = 1.toByte()
-        prf.update(int32BE)
-        prf.doFinal(uc, 0)
+            // 512 bits key length
+            val uc = ByteArray(64)
 
-        // copy to the key
-        System.arraycopy(uc, 0, key, 0, uc.size)
-
-        for (index in 2..iterations) {
-            // Uc = PRF(Password, Uc-1)
-            prf.update(uc)
+            // U1 = PRF(Password, Salt || INT_32_BE(i))
+            prf.update(salt)
+            val int32BE = ByteArray(4) { 0.toByte() }
+            int32BE[3] = 1.toByte()
+            prf.update(int32BE)
             prf.doFinal(uc, 0)
 
-            // F(Password, Salt, c, i) = U1 ^ U2 ^ ... ^ Uc
-            for (byteIndex in uc.indices) {
-                key[byteIndex] = key[byteIndex] xor uc[byteIndex]
-            }
-        }
+            // copy to the key
+            System.arraycopy(uc, 0, key, 0, uc.size)
 
-        Timber.v("## deriveKeys() : $iterations in ${System.currentTimeMillis() - t0} ms")
+            for (index in 2..iterations) {
+                // Uc = PRF(Password, Uc-1)
+                prf.update(uc)
+                prf.doFinal(uc, 0)
+
+                // F(Password, Salt, c, i) = U1 ^ U2 ^ ... ^ Uc
+                for (byteIndex in uc.indices) {
+                    key[byteIndex] = key[byteIndex] xor uc[byteIndex]
+                }
+            }
+        }.also {
+            Timber.v("## deriveKeys() : $iterations in $it ms")
+        }
 
         return key
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
index 4947761f05..7eec83abdd 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
@@ -35,6 +35,7 @@ import org.matrix.android.sdk.internal.session.SessionScope
 import org.matrix.android.sdk.internal.util.JsonCanonicalizer
 import org.matrix.android.sdk.internal.util.convertFromUTF8
 import org.matrix.android.sdk.internal.util.convertToUTF8
+import org.matrix.android.sdk.internal.util.time.Clock
 import org.matrix.olm.OlmAccount
 import org.matrix.olm.OlmException
 import org.matrix.olm.OlmMessage
@@ -55,7 +56,8 @@ internal class MXOlmDevice @Inject constructor(
          */
         private val store: IMXCryptoStore,
         private val olmSessionStore: OlmSessionStore,
-        private val inboundGroupSessionStore: InboundGroupSessionStore
+        private val inboundGroupSessionStore: InboundGroupSessionStore,
+        private val clock: Clock,
 ) {
 
     val mutex = Mutex()
@@ -277,7 +279,7 @@ internal class MXOlmDevice @Inject constructor(
             // Pretend we've received a message at this point, otherwise
             // if we try to send a message to the device, it won't use
             // this session
-            olmSessionWrapper.onMessageReceived()
+            olmSessionWrapper.onMessageReceived(clock.epochMillis())
 
             olmSessionStore.storeSession(olmSessionWrapper, theirIdentityKey)
 
@@ -348,7 +350,7 @@ internal class MXOlmDevice @Inject constructor(
 
                 val olmSessionWrapper = OlmSessionWrapper(olmSession, 0)
                 // This counts as a received message: set last received message time to now
-                olmSessionWrapper.onMessageReceived()
+                olmSessionWrapper.onMessageReceived(clock.epochMillis())
 
                 olmSessionStore.storeSession(olmSessionWrapper, theirDeviceIdentityKey)
             } catch (e: Exception) {
@@ -454,7 +456,7 @@ internal class MXOlmDevice @Inject constructor(
             payloadString =
                     olmSessionWrapper.mutex.withLock {
                         olmSessionWrapper.olmSession.decryptMessage(olmMessage).also {
-                            olmSessionWrapper.onMessageReceived()
+                            olmSessionWrapper.onMessageReceived(clock.epochMillis())
                         }
                     }
             olmSessionStore.storeSession(olmSessionWrapper, theirDeviceIdentityKey)
@@ -520,6 +522,7 @@ internal class MXOlmDevice @Inject constructor(
             return MXOutboundSessionInfo(
                     sessionId = sessionId,
                     sharedWithHelper = SharedWithHelper(roomId, sessionId, store),
+                    clock,
                     restoredOutboundGroupSession.creationTime
             )
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OlmSessionStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OlmSessionStore.kt
index f4fbca6a0f..aac6f67aea 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OlmSessionStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OlmSessionStore.kt
@@ -66,7 +66,8 @@ internal class OlmSessionStore @Inject constructor(private val store: IMXCryptoS
         olmSessions.getOrPut(deviceKey) { mutableListOf() }.forEach { cached ->
             getSafeSessionIdentifier(cached.olmSession)?.let { cachedSessionId ->
                 if (!persistedKnownSessions.contains(cachedSessionId)) {
-                    persistedKnownSessions.add(cachedSessionId)
+                    // as it's in cache put in on top
+                    persistedKnownSessions.add(0, cachedSessionId)
                 }
             }
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OneTimeKeysUploader.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OneTimeKeysUploader.kt
index 792c9a25dc..8143e36892 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OneTimeKeysUploader.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OneTimeKeysUploader.kt
@@ -23,6 +23,7 @@ import org.matrix.android.sdk.internal.crypto.model.rest.KeysUploadResponse
 import org.matrix.android.sdk.internal.crypto.tasks.UploadKeysTask
 import org.matrix.android.sdk.internal.session.SessionScope
 import org.matrix.android.sdk.internal.util.JsonCanonicalizer
+import org.matrix.android.sdk.internal.util.time.Clock
 import org.matrix.olm.OlmAccount
 import timber.log.Timber
 import javax.inject.Inject
@@ -38,6 +39,7 @@ internal class OneTimeKeysUploader @Inject constructor(
         private val olmDevice: MXOlmDevice,
         private val objectSigner: ObjectSigner,
         private val uploadKeysTask: UploadKeysTask,
+        private val clock: Clock,
         context: Context
 ) {
     // tell if there is a OTK check in progress
@@ -77,7 +79,7 @@ internal class OneTimeKeysUploader @Inject constructor(
             Timber.v("maybeUploadOneTimeKeys: already in progress")
             return
         }
-        if (System.currentTimeMillis() - lastOneTimeKeyCheck < ONE_TIME_KEY_UPLOAD_PERIOD) {
+        if (clock.epochMillis() - lastOneTimeKeyCheck < ONE_TIME_KEY_UPLOAD_PERIOD) {
             // we've done a key upload recently.
             Timber.v("maybeUploadOneTimeKeys: executed too recently")
             return
@@ -94,7 +96,7 @@ internal class OneTimeKeysUploader @Inject constructor(
 
         Timber.d("maybeUploadOneTimeKeys: otk count $oneTimeKeyCountFromSync , unpublished fallback key ${olmDevice.hasUnpublishedFallbackKey()}")
 
-        lastOneTimeKeyCheck = System.currentTimeMillis()
+        lastOneTimeKeyCheck = clock.epochMillis()
 
         // We then check how many keys we can store in the Account object.
         val maxOneTimeKeys = olmDevice.getMaxNumberOfOneTimeKeys()
@@ -126,7 +128,7 @@ internal class OneTimeKeysUploader @Inject constructor(
 
         // Check if we need to forget a fallback key
         val latestPublishedTime = getLastFallbackKeyPublishTime()
-        if (latestPublishedTime != 0L && System.currentTimeMillis() - latestPublishedTime > FALLBACK_KEY_FORGET_DELAY) {
+        if (latestPublishedTime != 0L && clock.epochMillis() - latestPublishedTime > FALLBACK_KEY_FORGET_DELAY) {
             // This should be called once you are reasonably certain that you will not receive any more messages
             // that use the old fallback key
             Timber.d("## forgetFallbackKey()")
@@ -168,7 +170,7 @@ internal class OneTimeKeysUploader @Inject constructor(
         olmDevice.markKeysAsPublished()
         if (hadUnpublishedFallbackKey) {
             // It had an unpublished fallback key that was published just now
-            saveLastFallbackKeyPublishTime(System.currentTimeMillis())
+            saveLastFallbackKeyPublishTime(clock.epochMillis())
         }
 
         if (response.hasOneTimeKeyCountsForAlgorithm(MXKey.KEY_SIGNED_CURVE_25519_TYPE)) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt
index dbdea97411..3b43ad672b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt
@@ -35,13 +35,14 @@ import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
 import org.matrix.android.sdk.internal.crypto.tasks.createUniqueTxnId
 import org.matrix.android.sdk.internal.session.SessionComponent
+import org.matrix.android.sdk.internal.util.time.Clock
 import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker
 import org.matrix.android.sdk.internal.worker.SessionWorkerParams
 import timber.log.Timber
 import javax.inject.Inject
 
 internal class SendGossipRequestWorker(context: Context, params: WorkerParameters, sessionManager: SessionManager) :
-    SessionSafeCoroutineWorker<SendGossipRequestWorker.Params>(context, params, sessionManager, Params::class.java) {
+        SessionSafeCoroutineWorker<SendGossipRequestWorker.Params>(context, params, sessionManager, Params::class.java) {
 
     @JsonClass(generateAdapter = true)
     internal data class Params(
@@ -57,6 +58,7 @@ internal class SendGossipRequestWorker(context: Context, params: WorkerParameter
     @Inject lateinit var sendToDeviceTask: SendToDeviceTask
     @Inject lateinit var cryptoStore: IMXCryptoStore
     @Inject lateinit var credentials: Credentials
+    @Inject lateinit var clock: Clock
 
     override fun injectWith(injector: SessionComponent) {
         injector.inject(this)
@@ -85,7 +87,7 @@ internal class SendGossipRequestWorker(context: Context, params: WorkerParameter
                         content = toDeviceContent.toContent(),
                         senderId = credentials.userId
                 ).also {
-                    it.ageLocalTs = System.currentTimeMillis()
+                    it.ageLocalTs = clock.epochMillis()
                 })
 
                 params.keyShareRequest.recipients.forEach { userToDeviceMap ->
@@ -109,7 +111,7 @@ internal class SendGossipRequestWorker(context: Context, params: WorkerParameter
                         content = toDeviceContent.toContent(),
                         senderId = credentials.userId
                 ).also {
-                    it.ageLocalTs = System.currentTimeMillis()
+                    it.ageLocalTs = clock.epochMillis()
                 })
 
                 params.secretShareRequest.recipients.forEach { userToDeviceMap ->
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt
index fd472fe73b..113d71d387 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt
@@ -34,6 +34,7 @@ import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
 import org.matrix.android.sdk.internal.crypto.tasks.createUniqueTxnId
 import org.matrix.android.sdk.internal.session.SessionComponent
+import org.matrix.android.sdk.internal.util.time.Clock
 import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker
 import org.matrix.android.sdk.internal.worker.SessionWorkerParams
 import timber.log.Timber
@@ -63,6 +64,7 @@ internal class SendGossipWorker(
     @Inject lateinit var credentials: Credentials
     @Inject lateinit var messageEncrypter: MessageEncrypter
     @Inject lateinit var ensureOlmSessionsForDevicesAction: EnsureOlmSessionsForDevicesAction
+    @Inject lateinit var clock: Clock
 
     override fun injectWith(injector: SessionComponent) {
         injector.inject(this)
@@ -129,7 +131,7 @@ internal class SendGossipWorker(
                 content = toDeviceContent.toContent(),
                 senderId = credentials.userId
         ).also {
-            it.ageLocalTs = System.currentTimeMillis()
+            it.ageLocalTs = clock.epochMillis()
         })
 
         try {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt
index fffc2b4d4b..df29a494db 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt
@@ -137,10 +137,14 @@ internal class EnsureOlmSessionsForDevicesAction @Inject constructor(
                 olmDevice.verifySignature(fingerprint, oneTimeKey.signalableJSONDictionary(), signature)
                 isVerified = true
             } catch (e: Exception) {
-                Timber.tag(loggerTag.value).d(e, "verifyKeyAndStartSession() : Verify error for otk: ${oneTimeKey.signalableJSONDictionary()}," +
-                        " signature:$signature fingerprint:$fingerprint")
-                Timber.tag(loggerTag.value).e("verifyKeyAndStartSession() : Verify error for ${deviceInfo.userId}|${deviceInfo.deviceId} " +
-                        " - signable json ${oneTimeKey.signalableJSONDictionary()}")
+                Timber.tag(loggerTag.value).d(
+                        e, "verifyKeyAndStartSession() : Verify error for otk: ${oneTimeKey.signalableJSONDictionary()}," +
+                        " signature:$signature fingerprint:$fingerprint"
+                )
+                Timber.tag(loggerTag.value).e(
+                        "verifyKeyAndStartSession() : Verify error for ${deviceInfo.userId}|${deviceInfo.deviceId} " +
+                                " - signable json ${oneTimeKey.signalableJSONDictionary()}"
+                )
                 errorMessage = e.message
             }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt
index f9bcdf2c68..86674b4ac5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt
@@ -26,13 +26,17 @@ import org.matrix.android.sdk.internal.crypto.OutgoingGossipingRequestManager
 import org.matrix.android.sdk.internal.crypto.RoomDecryptorProvider
 import org.matrix.android.sdk.internal.crypto.algorithms.megolm.MXMegolmDecryption
 import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 import javax.inject.Inject
 
-internal class MegolmSessionDataImporter @Inject constructor(private val olmDevice: MXOlmDevice,
-                                                             private val roomDecryptorProvider: RoomDecryptorProvider,
-                                                             private val outgoingGossipingRequestManager: OutgoingGossipingRequestManager,
-                                                             private val cryptoStore: IMXCryptoStore) {
+internal class MegolmSessionDataImporter @Inject constructor(
+        private val olmDevice: MXOlmDevice,
+        private val roomDecryptorProvider: RoomDecryptorProvider,
+        private val outgoingGossipingRequestManager: OutgoingGossipingRequestManager,
+        private val cryptoStore: IMXCryptoStore,
+        private val clock: Clock,
+) {
 
     /**
      * Import a list of megolm session keys.
@@ -47,7 +51,7 @@ internal class MegolmSessionDataImporter @Inject constructor(private val olmDevi
     fun handle(megolmSessionsData: List<MegolmSessionData>,
                fromBackup: Boolean,
                progressListener: ProgressListener?): ImportRoomKeysResult {
-        val t0 = System.currentTimeMillis()
+        val t0 = clock.epochMillis()
 
         val totalNumbersOfKeys = megolmSessionsData.size
         var lastProgress = 0
@@ -103,7 +107,7 @@ internal class MegolmSessionDataImporter @Inject constructor(private val olmDevi
             cryptoStore.markBackupDoneForInboundGroupSessions(olmInboundGroupSessionWrappers)
         }
 
-        val t1 = System.currentTimeMillis()
+        val t1 = clock.epochMillis()
 
         Timber.v("## importMegolmSessionsData : sessions import " + (t1 - t0) + " ms (" + megolmSessionsData.size + " sessions)")
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
index 4c407c9eb9..8ba4f6b56b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
@@ -96,11 +96,13 @@ internal class MXMegolmDecryption(private val userId: String,
         }
 
         return runCatching {
-            olmDevice.decryptGroupMessage(encryptedEventContent.ciphertext,
+            olmDevice.decryptGroupMessage(
+                    encryptedEventContent.ciphertext,
                     event.roomId,
                     timeline,
                     encryptedEventContent.sessionId,
-                    encryptedEventContent.senderKey)
+                    encryptedEventContent.senderKey
+            )
         }
                 .fold(
                         { olmDecryptionResult ->
@@ -132,9 +134,11 @@ internal class MXMegolmDecryption(private val userId: String,
                                             requestKeysForEvent(event, true)
                                         }
                                         // Encapsulate as withHeld exception
-                                        throw MXCryptoError.Base(MXCryptoError.ErrorType.KEYS_WITHHELD,
+                                        throw MXCryptoError.Base(
+                                                MXCryptoError.ErrorType.KEYS_WITHHELD,
                                                 withHeldInfo.code?.value ?: "",
-                                                withHeldInfo.reason)
+                                                withHeldInfo.reason
+                                        )
                                     }
 
                                     if (requestKeysOnFail) {
@@ -144,7 +148,8 @@ internal class MXMegolmDecryption(private val userId: String,
                                     throw MXCryptoError.Base(
                                             MXCryptoError.ErrorType.UNKNOWN_MESSAGE_INDEX,
                                             "UNKNOWN_MESSAGE_INDEX",
-                                            null)
+                                            null
+                                    )
                                 }
 
                                 val reason = String.format(MXCryptoError.OLM_REASON, throwable.olmException.message)
@@ -153,7 +158,8 @@ internal class MXMegolmDecryption(private val userId: String,
                                 throw MXCryptoError.Base(
                                         MXCryptoError.ErrorType.OLM,
                                         reason,
-                                        detailedReason)
+                                        detailedReason
+                                )
                             }
                             if (throwable is MXCryptoError.Base) {
                                 if (
@@ -166,9 +172,11 @@ internal class MXMegolmDecryption(private val userId: String,
                                             requestKeysForEvent(event, true)
                                         }
                                         // Encapsulate as withHeld exception
-                                        throw MXCryptoError.Base(MXCryptoError.ErrorType.KEYS_WITHHELD,
+                                        throw MXCryptoError.Base(
+                                                MXCryptoError.ErrorType.KEYS_WITHHELD,
                                                 withHeldInfo.code?.value ?: "",
-                                                withHeldInfo.reason)
+                                                withHeldInfo.reason
+                                        )
                                     } else {
                                         // This is un-used in Matrix Android SDK2, not sure if needed
                                         // addEventToPendingList(event, timeline)
@@ -298,13 +306,15 @@ internal class MXMegolmDecryption(private val userId: String,
         }
 
         Timber.tag(loggerTag.value).i("onRoomKeyEvent addInboundGroupSession ${roomKeyContent.sessionId}")
-        val added = olmDevice.addInboundGroupSession(roomKeyContent.sessionId,
+        val added = olmDevice.addInboundGroupSession(
+                roomKeyContent.sessionId,
                 roomKeyContent.sessionKey,
                 roomKeyContent.roomId,
                 senderKey,
                 forwardingCurve25519KeyChain,
                 keysClaimed,
-                exportFormat)
+                exportFormat
+        )
 
         if (added) {
             defaultKeysBackupService.maybeBackupKeys()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
index 3eba04b9f1..8ad9f191d7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
@@ -56,6 +56,7 @@ internal class MXMegolmDecryptionFactory @Inject constructor(
                 sendToDeviceTask,
                 coroutineDispatchers,
                 cryptoCoroutineScope,
-                eventsManager)
+                eventsManager
+        )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
index f052194230..4ceef4fa5c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
@@ -46,6 +46,7 @@ import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
 import org.matrix.android.sdk.internal.util.JsonCanonicalizer
 import org.matrix.android.sdk.internal.util.convertToUTF8
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 
 private val loggerTag = LoggerTag("MXMegolmEncryption", LoggerTag.CRYPTO)
@@ -64,7 +65,8 @@ internal class MXMegolmEncryption(
         private val messageEncrypter: MessageEncrypter,
         private val warnOnUnknownDevicesRepository: WarnOnUnknownDeviceRepository,
         private val coroutineDispatchers: MatrixCoroutineDispatchers,
-        private val cryptoCoroutineScope: CoroutineScope
+        private val cryptoCoroutineScope: CoroutineScope,
+        private val clock: Clock,
 ) : IMXEncrypting, IMXGroupEncryption {
 
     // OutboundSessionInfo. Null if we haven't yet started setting one up. Note
@@ -86,11 +88,11 @@ internal class MXMegolmEncryption(
     override suspend fun encryptEventContent(eventContent: Content,
                                              eventType: String,
                                              userIds: List<String>): Content {
-        val ts = System.currentTimeMillis()
+        val ts = clock.epochMillis()
         Timber.tag(loggerTag.value).v("encryptEventContent : getDevicesInRoom")
         val devices = getDevicesInRoom(userIds)
         Timber.tag(loggerTag.value).d("encrypt event in room=$roomId - devices count in room ${devices.allowedDevices.toDebugCount()}")
-        Timber.tag(loggerTag.value).v("encryptEventContent ${System.currentTimeMillis() - ts}: getDevicesInRoom ${devices.allowedDevices.toDebugString()}")
+        Timber.tag(loggerTag.value).v("encryptEventContent ${clock.epochMillis() - ts}: getDevicesInRoom ${devices.allowedDevices.toDebugString()}")
         val outboundSession = ensureOutboundSession(devices.allowedDevices)
 
         return encryptContent(outboundSession, eventType, eventContent)
@@ -99,7 +101,7 @@ internal class MXMegolmEncryption(
                     // annoyingly we have to serialize again the saved outbound session to store message index :/
                     // if not we would see duplicate message index errors
                     olmDevice.storeOutboundGroupSessionForRoom(roomId, outboundSession.sessionId)
-                    Timber.tag(loggerTag.value).d("encrypt event in room=$roomId Finished in ${System.currentTimeMillis() - ts} millis")
+                    Timber.tag(loggerTag.value).d("encrypt event in room=$roomId Finished in ${clock.epochMillis() - ts} millis")
                 }
     }
 
@@ -125,14 +127,14 @@ internal class MXMegolmEncryption(
     }
 
     override suspend fun preshareKey(userIds: List<String>) {
-        val ts = System.currentTimeMillis()
+        val ts = clock.epochMillis()
         Timber.tag(loggerTag.value).d("preshareKey started in $roomId ...")
         val devices = getDevicesInRoom(userIds)
         val outboundSession = ensureOutboundSession(devices.allowedDevices)
 
         notifyWithheldForSession(devices.withHeldDevices, outboundSession)
 
-        Timber.tag(loggerTag.value).d("preshareKey in $roomId done in  ${System.currentTimeMillis() - ts} millis")
+        Timber.tag(loggerTag.value).d("preshareKey in $roomId done in  ${clock.epochMillis() - ts} millis")
     }
 
     /**
@@ -148,12 +150,14 @@ internal class MXMegolmEncryption(
                 "ed25519" to olmDevice.deviceEd25519Key!!
         )
 
-        olmDevice.addInboundGroupSession(sessionId!!, olmDevice.getSessionKey(sessionId)!!, roomId, olmDevice.deviceCurve25519Key!!,
-                emptyList(), keysClaimedMap, false)
+        olmDevice.addInboundGroupSession(
+                sessionId!!, olmDevice.getSessionKey(sessionId)!!, roomId, olmDevice.deviceCurve25519Key!!,
+                emptyList(), keysClaimedMap, false
+        )
 
         defaultKeysBackupService.maybeBackupKeys()
 
-        return MXOutboundSessionInfo(sessionId, SharedWithHelper(roomId, sessionId, cryptoStore))
+        return MXOutboundSessionInfo(sessionId, SharedWithHelper(roomId, sessionId, cryptoStore), clock)
     }
 
     /**
@@ -243,12 +247,12 @@ internal class MXMegolmEncryption(
         payload["type"] = EventType.ROOM_KEY
         payload["content"] = submap
 
-        var t0 = System.currentTimeMillis()
+        var t0 = clock.epochMillis()
         Timber.tag(loggerTag.value).v("shareUserDevicesKey() : starts")
 
         val results = ensureOlmSessionsForDevicesAction.handle(devicesByUser)
         Timber.tag(loggerTag.value).v(
-                """shareUserDevicesKey(): ensureOlmSessionsForDevices succeeds after ${System.currentTimeMillis() - t0} ms"""
+                """shareUserDevicesKey(): ensureOlmSessionsForDevices succeeds after ${clock.epochMillis() - t0} ms"""
                         .trimMargin()
         )
         val contentMap = MXUsersDevicesMap<Any>()
@@ -301,7 +305,7 @@ internal class MXMegolmEncryption(
         cryptoStore.saveGossipingEvents(gossipingEventBuffer)
 
         if (haveTargets) {
-            t0 = System.currentTimeMillis()
+            t0 = clock.epochMillis()
             Timber.tag(loggerTag.value).i("shareUserDevicesKey() ${session.sessionId} : has target")
             Timber.tag(loggerTag.value).d("sending to device room key for ${session.sessionId} to ${contentMap.toDebugString()}")
             val sendToDeviceParams = SendToDeviceTask.Params(EventType.ENCRYPTED, contentMap)
@@ -309,7 +313,7 @@ internal class MXMegolmEncryption(
                 withContext(coroutineDispatchers.io) {
                     sendToDeviceTask.execute(sendToDeviceParams)
                 }
-                Timber.tag(loggerTag.value).i("shareUserDevicesKey() : sendToDevice succeeds after ${System.currentTimeMillis() - t0} ms")
+                Timber.tag(loggerTag.value).i("shareUserDevicesKey() : sendToDevice succeeds after ${clock.epochMillis() - t0} ms")
             } catch (failure: Throwable) {
                 // What to do here...
                 Timber.tag(loggerTag.value).e("shareUserDevicesKey() : Failed to share <${session.sessionId}>")
@@ -333,8 +337,10 @@ internal class MXMegolmEncryption(
                                           sessionId: String,
                                           senderKey: String?,
                                           code: WithHeldCode) {
-        Timber.tag(loggerTag.value).d("notifyKeyWithHeld() :sending withheld for session:$sessionId and code $code to" +
-                " ${targets.joinToString { "${it.userId}|${it.deviceId}" }}")
+        Timber.tag(loggerTag.value).d(
+                "notifyKeyWithHeld() :sending withheld for session:$sessionId and code $code to" +
+                        " ${targets.joinToString { "${it.userId}|${it.deviceId}" }}"
+        )
         val withHeldContent = RoomKeyWithHeldContent(
                 roomId = roomId,
                 senderKey = senderKey,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt
index 136fdc05f5..4225d604aa 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt
@@ -28,6 +28,7 @@ import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
 import org.matrix.android.sdk.internal.di.DeviceId
 import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.util.time.Clock
 import javax.inject.Inject
 
 internal class MXMegolmEncryptionFactory @Inject constructor(
@@ -42,7 +43,9 @@ internal class MXMegolmEncryptionFactory @Inject constructor(
         private val messageEncrypter: MessageEncrypter,
         private val warnOnUnknownDevicesRepository: WarnOnUnknownDeviceRepository,
         private val coroutineDispatchers: MatrixCoroutineDispatchers,
-        private val cryptoCoroutineScope: CoroutineScope) {
+        private val cryptoCoroutineScope: CoroutineScope,
+        private val clock: Clock,
+) {
 
     fun create(roomId: String): MXMegolmEncryption {
         return MXMegolmEncryption(
@@ -58,7 +61,8 @@ internal class MXMegolmEncryptionFactory @Inject constructor(
                 messageEncrypter = messageEncrypter,
                 warnOnUnknownDevicesRepository = warnOnUnknownDevicesRepository,
                 coroutineDispatchers = coroutineDispatchers,
-                cryptoCoroutineScope = cryptoCoroutineScope
+                cryptoCoroutineScope = cryptoCoroutineScope,
+                clock = clock,
         )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt
index 091abd4974..28d925d8fd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt
@@ -18,21 +18,24 @@ package org.matrix.android.sdk.internal.crypto.algorithms.megolm
 
 import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.api.session.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 
 internal class MXOutboundSessionInfo(
         // The id of the session
         val sessionId: String,
         val sharedWithHelper: SharedWithHelper,
+        private val clock: Clock,
         // When the session was created
-        private val creationTime: Long = System.currentTimeMillis()) {
+        private val creationTime: Long = clock.epochMillis(),
+) {
 
     // Number of times this session has been used
     var useCount: Int = 0
 
     fun needsRotation(rotationPeriodMsgs: Int, rotationPeriodMs: Int): Boolean {
         var needsRotation = false
-        val sessionLifetime = System.currentTimeMillis() - creationTime
+        val sessionLifetime = clock.epochMillis() - creationTime
 
         if (useCount >= rotationPeriodMsgs || sessionLifetime >= rotationPeriodMs) {
             Timber.v("## needsRotation() : Rotating megolm session after $useCount, ${sessionLifetime}ms")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt
index 59d78c3e05..61ad345c62 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt
@@ -36,6 +36,7 @@ internal class SharedWithHelper(
                 userId = deviceInfo.userId,
                 deviceId = deviceInfo.deviceId,
                 deviceIdentityKey = deviceInfo.identityKey() ?: "",
-                chainIndex = chainIndex)
+                chainIndex = chainIndex
+        )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
index 0db8700852..13eeefd1a6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
@@ -45,20 +45,26 @@ internal class MXOlmDecryption(
     override suspend fun decryptEvent(event: Event, timeline: String): MXEventDecryptionResult {
         val olmEventContent = event.content.toModel<OlmEventContent>() ?: run {
             Timber.tag(loggerTag.value).e("## decryptEvent() : bad event format")
-            throw MXCryptoError.Base(MXCryptoError.ErrorType.BAD_EVENT_FORMAT,
-                    MXCryptoError.BAD_EVENT_FORMAT_TEXT_REASON)
+            throw MXCryptoError.Base(
+                    MXCryptoError.ErrorType.BAD_EVENT_FORMAT,
+                    MXCryptoError.BAD_EVENT_FORMAT_TEXT_REASON
+            )
         }
 
         val cipherText = olmEventContent.ciphertext ?: run {
             Timber.tag(loggerTag.value).e("## decryptEvent() : missing cipher text")
-            throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_CIPHER_TEXT,
-                    MXCryptoError.MISSING_CIPHER_TEXT_REASON)
+            throw MXCryptoError.Base(
+                    MXCryptoError.ErrorType.MISSING_CIPHER_TEXT,
+                    MXCryptoError.MISSING_CIPHER_TEXT_REASON
+            )
         }
 
         val senderKey = olmEventContent.senderKey ?: run {
             Timber.tag(loggerTag.value).e("## decryptEvent() : missing sender key")
-            throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_SENDER_KEY,
-                    MXCryptoError.MISSING_SENDER_KEY_TEXT_REASON)
+            throw MXCryptoError.Base(
+                    MXCryptoError.ErrorType.MISSING_SENDER_KEY,
+                    MXCryptoError.MISSING_SENDER_KEY_TEXT_REASON
+            )
         }
 
         val messageAny = cipherText[olmDevice.deviceCurve25519Key] ?: run {
@@ -98,52 +104,70 @@ internal class MXOlmDecryption(
         }
 
         if (olmPayloadContent.recipient != userId) {
-            Timber.tag(loggerTag.value).e("## decryptEvent() : Event ${event.eventId}:" +
-                    " Intended recipient ${olmPayloadContent.recipient} does not match our id $userId")
-            throw MXCryptoError.Base(MXCryptoError.ErrorType.BAD_RECIPIENT,
-                    String.format(MXCryptoError.BAD_RECIPIENT_REASON, olmPayloadContent.recipient))
+            Timber.tag(loggerTag.value).e(
+                    "## decryptEvent() : Event ${event.eventId}:" +
+                            " Intended recipient ${olmPayloadContent.recipient} does not match our id $userId"
+            )
+            throw MXCryptoError.Base(
+                    MXCryptoError.ErrorType.BAD_RECIPIENT,
+                    String.format(MXCryptoError.BAD_RECIPIENT_REASON, olmPayloadContent.recipient)
+            )
         }
 
         val recipientKeys = olmPayloadContent.recipientKeys ?: run {
-            Timber.tag(loggerTag.value).e("## decryptEvent() : Olm event (id=${event.eventId}) contains no 'recipient_keys'" +
-                    " property; cannot prevent unknown-key attack")
-            throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_PROPERTY,
-                    String.format(MXCryptoError.ERROR_MISSING_PROPERTY_REASON, "recipient_keys"))
+            Timber.tag(loggerTag.value).e(
+                    "## decryptEvent() : Olm event (id=${event.eventId}) contains no 'recipient_keys'" +
+                            " property; cannot prevent unknown-key attack"
+            )
+            throw MXCryptoError.Base(
+                    MXCryptoError.ErrorType.MISSING_PROPERTY,
+                    String.format(MXCryptoError.ERROR_MISSING_PROPERTY_REASON, "recipient_keys")
+            )
         }
 
         val ed25519 = recipientKeys["ed25519"]
 
         if (ed25519 != olmDevice.deviceEd25519Key) {
             Timber.tag(loggerTag.value).e("## decryptEvent() : Event ${event.eventId}: Intended recipient ed25519 key $ed25519 did not match ours")
-            throw MXCryptoError.Base(MXCryptoError.ErrorType.BAD_RECIPIENT_KEY,
-                    MXCryptoError.BAD_RECIPIENT_KEY_REASON)
+            throw MXCryptoError.Base(
+                    MXCryptoError.ErrorType.BAD_RECIPIENT_KEY,
+                    MXCryptoError.BAD_RECIPIENT_KEY_REASON
+            )
         }
 
         if (olmPayloadContent.sender.isNullOrBlank()) {
             Timber.tag(loggerTag.value)
                     .e("## decryptEvent() : Olm event (id=${event.eventId}) contains no 'sender' property; cannot prevent unknown-key attack")
-            throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_PROPERTY,
-                    String.format(MXCryptoError.ERROR_MISSING_PROPERTY_REASON, "sender"))
+            throw MXCryptoError.Base(
+                    MXCryptoError.ErrorType.MISSING_PROPERTY,
+                    String.format(MXCryptoError.ERROR_MISSING_PROPERTY_REASON, "sender")
+            )
         }
 
         if (olmPayloadContent.sender != event.senderId) {
             Timber.tag(loggerTag.value)
                     .e("Event ${event.eventId}:  sender ${olmPayloadContent.sender} does not match reported sender ${event.senderId}")
-            throw MXCryptoError.Base(MXCryptoError.ErrorType.FORWARDED_MESSAGE,
-                    String.format(MXCryptoError.FORWARDED_MESSAGE_REASON, olmPayloadContent.sender))
+            throw MXCryptoError.Base(
+                    MXCryptoError.ErrorType.FORWARDED_MESSAGE,
+                    String.format(MXCryptoError.FORWARDED_MESSAGE_REASON, olmPayloadContent.sender)
+            )
         }
 
         if (olmPayloadContent.roomId != event.roomId) {
             Timber.tag(loggerTag.value)
                     .e("## decryptEvent() : Event ${event.eventId}:  room ${olmPayloadContent.roomId} does not match reported room ${event.roomId}")
-            throw MXCryptoError.Base(MXCryptoError.ErrorType.BAD_ROOM,
-                    String.format(MXCryptoError.BAD_ROOM_REASON, olmPayloadContent.roomId))
+            throw MXCryptoError.Base(
+                    MXCryptoError.ErrorType.BAD_ROOM,
+                    String.format(MXCryptoError.BAD_ROOM_REASON, olmPayloadContent.roomId)
+            )
         }
 
         val keys = olmPayloadContent.keys ?: run {
             Timber.tag(loggerTag.value).e("## decryptEvent failed : null keys")
-            throw MXCryptoError.Base(MXCryptoError.ErrorType.UNABLE_TO_DECRYPT,
-                    MXCryptoError.MISSING_CIPHER_TEXT_REASON)
+            throw MXCryptoError.Base(
+                    MXCryptoError.ErrorType.UNABLE_TO_DECRYPT,
+                    MXCryptoError.MISSING_CIPHER_TEXT_REASON
+            )
         }
 
         return MXEventDecryptionResult(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt
index 972176e25b..d5c5e85e41 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt
@@ -26,6 +26,7 @@ internal class MXOlmDecryptionFactory @Inject constructor(private val olmDevice:
     fun create(): MXOlmDecryption {
         return MXOlmDecryption(
                 olmDevice,
-                userId)
+                userId
+        )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt
index 7fdfd5a287..c842c54041 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt
@@ -33,7 +33,7 @@ internal class MXOlmEncryption(
         private val messageEncrypter: MessageEncrypter,
         private val deviceListManager: DeviceListManager,
         private val ensureOlmSessionsForUsersAction: EnsureOlmSessionsForUsersAction) :
-    IMXEncrypting {
+        IMXEncrypting {
 
     override suspend fun encryptEventContent(eventContent: Content, eventType: String, userIds: List<String>): Content {
         // pick the list of recipients based on the membership list.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt
index 50ce2d2bf3..44e55900e4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt
@@ -38,6 +38,7 @@ internal class MXOlmEncryptionFactory @Inject constructor(private val olmDevice:
                 cryptoStore,
                 messageEncrypter,
                 deviceListManager,
-                ensureOlmSessionsForUsersAction)
+                ensureOlmSessionsForUsersAction
+        )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MXEncryptedAttachments.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MXEncryptedAttachments.kt
index 91b6af6fc3..65bbb0c412 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MXEncryptedAttachments.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MXEncryptedAttachments.kt
@@ -23,6 +23,7 @@ import org.matrix.android.sdk.api.session.crypto.model.EncryptedFileKey
 import org.matrix.android.sdk.internal.util.base64ToBase64Url
 import org.matrix.android.sdk.internal.util.base64ToUnpaddedBase64
 import org.matrix.android.sdk.internal.util.base64UrlToBase64
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 import java.io.ByteArrayOutputStream
 import java.io.File
@@ -42,8 +43,9 @@ internal object MXEncryptedAttachments {
 
     fun encrypt(clearStream: InputStream,
                 outputFile: File,
+                clock: Clock,
                 progress: ((current: Int, total: Int) -> Unit)): EncryptedFileInfo {
-        val t0 = System.currentTimeMillis()
+        val t0 = clock.epochMillis()
         val secureRandom = SecureRandom()
         val initVectorBytes = ByteArray(16) { 0.toByte() }
 
@@ -100,7 +102,7 @@ internal object MXEncryptedAttachments {
                 hashes = mapOf("sha256" to base64ToUnpaddedBase64(Base64.encodeToString(messageDigest.digest(), Base64.DEFAULT))),
                 v = "v2"
         )
-                .also { Timber.v("Encrypt in ${System.currentTimeMillis() - t0}ms") }
+                .also { Timber.v("Encrypt in ${clock.epochMillis() - t0}ms") }
     }
 
 //    fun cipherInputStream(attachmentStream: InputStream, mimetype: String?): Pair<DigestInputStream, EncryptedFileInfo> {
@@ -159,8 +161,8 @@ internal object MXEncryptedAttachments {
      * @param attachmentStream the attachment stream. Will be closed after this method call.
      * @return the encryption file info
      */
-    fun encryptAttachment(attachmentStream: InputStream): EncryptionResult {
-        val t0 = System.currentTimeMillis()
+    fun encryptAttachment(attachmentStream: InputStream, clock: Clock): EncryptionResult {
+        val t0 = clock.epochMillis()
         val secureRandom = SecureRandom()
 
         // generate a random iv key
@@ -221,7 +223,7 @@ internal object MXEncryptedAttachments {
                 ),
                 encryptedByteArray = byteArrayOutputStream.toByteArray()
         )
-                .also { Timber.v("Encrypt in ${System.currentTimeMillis() - t0}ms") }
+                .also { Timber.v("Encrypt in ${clock.epochMillis() - t0}ms") }
     }
 
     /**
@@ -234,14 +236,16 @@ internal object MXEncryptedAttachments {
      */
     fun decryptAttachment(attachmentStream: InputStream?,
                           elementToDecrypt: ElementToDecrypt?,
-                          outputStream: OutputStream): Boolean {
+                          outputStream: OutputStream,
+                          clock: Clock
+    ): Boolean {
         // sanity checks
         if (null == attachmentStream || elementToDecrypt == null) {
             Timber.e("## decryptAttachment() : null stream")
             return false
         }
 
-        val t0 = System.currentTimeMillis()
+        val t0 = clock.epochMillis()
 
         try {
             val key = Base64.decode(base64UrlToBase64(elementToDecrypt.k), Base64.DEFAULT)
@@ -279,7 +283,8 @@ internal object MXEncryptedAttachments {
                 return false
             }
 
-            return true.also { Timber.v("Decrypt in ${System.currentTimeMillis() - t0}ms") }
+            Timber.v("Decrypt in ${clock.epochMillis() - t0} ms")
+            return true
         } catch (oom: OutOfMemoryError) {
             Timber.e(oom, "## decryptAttachment() failed: OOM")
         } catch (e: Exception) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
index ba1718688f..e2887e5826 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
@@ -566,8 +566,10 @@ internal class DefaultCrossSigningService @Inject constructor(
             }
 
             // Sign the other MasterKey with our UserSigning key
-            val newSignature = JsonCanonicalizer.getCanonicalJson(Map::class.java,
-                    otherMasterKeys.signalableJSONDictionary()).let { userPkSigning?.sign(it) }
+            val newSignature = JsonCanonicalizer.getCanonicalJson(
+                    Map::class.java,
+                    otherMasterKeys.signalableJSONDictionary()
+            ).let { userPkSigning?.sign(it) }
 
             if (newSignature == null) {
                 // race??
@@ -684,7 +686,8 @@ internal class DefaultCrossSigningService @Inject constructor(
         val otherSSKSignature = otherDevice.signatures?.get(otherUserId)?.get("ed25519:${otherKeys.selfSigningKey()?.unpaddedBase64PublicKey}")
                 ?: return legacyFallbackTrust(
                         locallyTrusted,
-                        DeviceTrustResult.MissingDeviceSignature(otherDeviceId, otherKeys.selfSigningKey()
+                        DeviceTrustResult.MissingDeviceSignature(
+                                otherDeviceId, otherKeys.selfSigningKey()
                                 ?.unpaddedBase64PublicKey
                                 ?: ""
                         )
@@ -733,7 +736,8 @@ internal class DefaultCrossSigningService @Inject constructor(
         val otherSSKSignature = otherDevice.signatures?.get(otherKeys.userId)?.get("ed25519:${otherKeys.selfSigningKey()?.unpaddedBase64PublicKey}")
                 ?: return legacyFallbackTrust(
                         locallyTrusted,
-                        DeviceTrustResult.MissingDeviceSignature(otherDevice.deviceId, otherKeys.selfSigningKey()
+                        DeviceTrustResult.MissingDeviceSignature(
+                                otherDevice.deviceId, otherKeys.selfSigningKey()
                                 ?.unpaddedBase64PublicKey
                                 ?: ""
                         )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
index e63a6dc791..e6352809c4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
@@ -516,7 +516,8 @@ internal class DefaultKeysBackupService @Inject constructor(
                     UpdateKeysBackupVersionBody(
                             algorithm = keysBackupVersion.algorithm,
                             authData = newMegolmBackupAuthDataWithNewSignature.toJsonDict(),
-                            version = keysBackupVersion.version)
+                            version = keysBackupVersion.version
+                    )
                 }
 
                 // And send it to the homeserver
@@ -719,14 +720,18 @@ internal class DefaultKeysBackupService @Inject constructor(
                             }
                         }
                     }
-                    Timber.v("restoreKeysWithRecoveryKey: Decrypted ${sessionsData.size} keys out" +
-                            " of $sessionsFromHsCount from the backup store on the homeserver")
+                    Timber.v(
+                            "restoreKeysWithRecoveryKey: Decrypted ${sessionsData.size} keys out" +
+                                    " of $sessionsFromHsCount from the backup store on the homeserver"
+                    )
 
                     // Do not trigger a backup for them if they come from the backup version we are using
                     val backUp = keysVersionResult.version != keysBackupVersion?.version
                     if (backUp) {
-                        Timber.v("restoreKeysWithRecoveryKey: Those keys will be backed up" +
-                                " to backup version: ${keysBackupVersion?.version}")
+                        Timber.v(
+                                "restoreKeysWithRecoveryKey: Those keys will be backed up" +
+                                        " to backup version: ${keysBackupVersion?.version}"
+                        )
                     }
 
                     // Import them into the crypto store
@@ -801,11 +806,15 @@ internal class DefaultKeysBackupService @Inject constructor(
             // Get key for the room and for the session
             val data = getRoomSessionDataTask.execute(GetRoomSessionDataTask.Params(roomId, sessionId, version))
             // Convert to KeysBackupData
-            KeysBackupData(mutableMapOf(
-                    roomId to RoomKeysBackupData(mutableMapOf(
-                            sessionId to data
-                    ))
-            ))
+            KeysBackupData(
+                    mutableMapOf(
+                            roomId to RoomKeysBackupData(
+                                    mutableMapOf(
+                                            sessionId to data
+                                    )
+                            )
+                    )
+            )
         } else if (roomId != null) {
             // Get all keys for the room
             val data = getRoomSessionsDataTask.execute(GetRoomSessionsDataTask.Params(roomId, version))
@@ -1326,7 +1335,8 @@ internal class DefaultKeysBackupService @Inject constructor(
                 "sender_key" to sessionData.senderKey,
                 "sender_claimed_keys" to sessionData.senderClaimedKeys,
                 "forwarding_curve25519_key_chain" to (sessionData.forwardingCurve25519KeyChain.orEmpty()),
-                "session_key" to sessionData.sessionKey)
+                "session_key" to sessionData.sessionKey
+        )
 
         val json = MoshiProvider.providesMoshi()
                 .adapter(Map::class.java)
@@ -1354,7 +1364,8 @@ internal class DefaultKeysBackupService @Inject constructor(
                 sessionData = mapOf(
                         "ciphertext" to encryptedSessionBackupData.mCipherText,
                         "mac" to encryptedSessionBackupData.mMac,
-                        "ephemeral" to encryptedSessionBackupData.mEphemeralKey)
+                        "ephemeral" to encryptedSessionBackupData.mEphemeralKey
+                )
         )
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPassword.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPassword.kt
index c12879dbee..4d5b38acbf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPassword.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPassword.kt
@@ -26,6 +26,7 @@ import java.util.UUID
 import javax.crypto.Mac
 import javax.crypto.spec.SecretKeySpec
 import kotlin.experimental.xor
+import kotlin.system.measureTimeMillis
 
 private const val SALT_LENGTH = 32
 private const val DEFAULT_ITERATION = 500_000
@@ -91,52 +92,53 @@ internal fun deriveKey(password: String,
                        iterations: Int,
                        progressListener: ProgressListener?): ByteArray {
     // Note: copied and adapted from MXMegolmExportEncryption
-    val t0 = System.currentTimeMillis()
-
     // based on https://en.wikipedia.org/wiki/PBKDF2 algorithm
     // it is simpler than the generic algorithm because the expected key length is equal to the mac key length.
     // noticed as dklen/hlen
 
-    // dklen = 256
-    // hlen = 512
-    val prf = Mac.getInstance("HmacSHA512")
-
-    prf.init(SecretKeySpec(password.toByteArray(), "HmacSHA512"))
-
     // 256 bits key length
     val dk = ByteArray(32)
-    val uc = ByteArray(64)
 
-    // U1 = PRF(Password, Salt || INT_32_BE(i)) with i goes from 1 to dklen/hlen
-    prf.update(salt.toByteArray())
-    val int32BE = byteArrayOf(0, 0, 0, 1)
-    prf.update(int32BE)
-    prf.doFinal(uc, 0)
+    measureTimeMillis {
+        // dklen = 256
+        // hlen = 512
+        val prf = Mac.getInstance("HmacSHA512")
 
-    // copy to the key
-    System.arraycopy(uc, 0, dk, 0, dk.size)
+        prf.init(SecretKeySpec(password.toByteArray(), "HmacSHA512"))
 
-    var lastProgress = -1
+        val uc = ByteArray(64)
 
-    for (index in 2..iterations) {
-        // Uc = PRF(Password, Uc-1)
-        prf.update(uc)
+        // U1 = PRF(Password, Salt || INT_32_BE(i)) with i goes from 1 to dklen/hlen
+        prf.update(salt.toByteArray())
+        val int32BE = byteArrayOf(0, 0, 0, 1)
+        prf.update(int32BE)
         prf.doFinal(uc, 0)
 
-        // F(Password, Salt, c, i) = U1 ^ U2 ^ ... ^ Uc
-        for (byteIndex in dk.indices) {
-            dk[byteIndex] = dk[byteIndex] xor uc[byteIndex]
-        }
+        // copy to the key
+        System.arraycopy(uc, 0, dk, 0, dk.size)
 
-        val progress = (index + 1) * 100 / iterations
-        if (progress != lastProgress) {
-            lastProgress = progress
-            progressListener?.onProgress(lastProgress, 100)
+        var lastProgress = -1
+
+        for (index in 2..iterations) {
+            // Uc = PRF(Password, Uc-1)
+            prf.update(uc)
+            prf.doFinal(uc, 0)
+
+            // F(Password, Salt, c, i) = U1 ^ U2 ^ ... ^ Uc
+            for (byteIndex in dk.indices) {
+                dk[byteIndex] = dk[byteIndex] xor uc[byteIndex]
+            }
+
+            val progress = (index + 1) * 100 / iterations
+            if (progress != lastProgress) {
+                lastProgress = progress
+                progressListener?.onProgress(lastProgress, 100)
+            }
         }
+    }.also {
+        Timber.v("KeysBackupPassword: deriveKeys() : $iterations in $it ms")
     }
 
-    Timber.v("KeysBackupPassword: deriveKeys() : " + iterations + " in " + (System.currentTimeMillis() - t0) + " ms")
-
     return dk
 }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt
index 7f1b03b932..f90522b036 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt
@@ -40,7 +40,8 @@ internal class DefaultDeleteRoomSessionDataTask @Inject constructor(
             roomKeysApi.deleteRoomSessionData(
                     params.roomId,
                     params.sessionId,
-                    params.version)
+                    params.version
+            )
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt
index 394cc861d6..7db33e0c46 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt
@@ -38,7 +38,8 @@ internal class DefaultDeleteRoomSessionsDataTask @Inject constructor(
         return executeRequest(globalErrorReceiver) {
             roomKeysApi.deleteRoomSessionsData(
                     params.roomId,
-                    params.version)
+                    params.version
+            )
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt
index ff515ed80f..df8e6bfebf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt
@@ -41,7 +41,8 @@ internal class DefaultGetRoomSessionDataTask @Inject constructor(
             roomKeysApi.getRoomSessionData(
                     params.roomId,
                     params.sessionId,
-                    params.version)
+                    params.version
+            )
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt
index 1b4fe2d966..f9ea078ef2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt
@@ -39,7 +39,8 @@ internal class DefaultGetRoomSessionsDataTask @Inject constructor(
         return executeRequest(globalErrorReceiver) {
             roomKeysApi.getRoomSessionsData(
                     params.roomId,
-                    params.version)
+                    params.version
+            )
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt
index 180aaecf82..637c6ddeb7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt
@@ -44,7 +44,8 @@ internal class DefaultStoreRoomSessionDataTask @Inject constructor(
                     params.roomId,
                     params.sessionId,
                     params.version,
-                    params.keyBackupData)
+                    params.keyBackupData
+            )
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt
index d1aa9d2eb0..09e52da755 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt
@@ -42,7 +42,8 @@ internal class DefaultStoreRoomSessionsDataTask @Inject constructor(
             roomKeysApi.storeRoomSessionsData(
                     params.roomId,
                     params.version,
-                    params.roomKeysBackupData)
+                    params.roomKeysBackupData
+            )
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt
index 3dbeafe9de..47f2578c43 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt
@@ -40,7 +40,8 @@ internal class DefaultStoreSessionsDataTask @Inject constructor(
         return executeRequest(globalErrorReceiver) {
             roomKeysApi.storeSessionsData(
                     params.version,
-                    params.keysBackupData)
+                    params.keysBackupData
+            )
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmSessionWrapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmSessionWrapper.kt
index 927d049eca..d7ce553f39 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmSessionWrapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmSessionWrapper.kt
@@ -34,7 +34,7 @@ internal data class OlmSessionWrapper(
     /**
      * Notify that a message has been received on this olm session so that it updates `lastReceivedMessageTs`
      */
-    fun onMessageReceived() {
-        lastReceivedMessageTs = System.currentTimeMillis()
+    fun onMessageReceived(currentTimeMillis: Long) {
+        lastReceivedMessageTs = currentTimeMillis
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
index 19e66635c7..dc50afe67d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
@@ -66,7 +66,7 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
                                      key: SsssKeySpec?,
                                      keyName: String,
                                      keySigner: KeySigner?): SsssKeyCreationInfo {
-        return withContext(cryptoCoroutineScope.coroutineContext + coroutineDispatchers.main) {
+        return withContext(cryptoCoroutineScope.coroutineContext + coroutineDispatchers.computation) {
             val bytes = (key as? RawBytesKeySpec)?.privateKey
                     ?: ByteArray(32).also {
                         SecureRandom().nextBytes(it)
@@ -99,7 +99,7 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
                                                    passphrase: String,
                                                    keySigner: KeySigner,
                                                    progressListener: ProgressListener?): SsssKeyCreationInfo {
-        return withContext(cryptoCoroutineScope.coroutineContext + coroutineDispatchers.main) {
+        return withContext(cryptoCoroutineScope.coroutineContext + coroutineDispatchers.computation) {
             val privatePart = generatePrivateKeyWithPassword(passphrase, progressListener)
 
             val storageKeyContent = SecretStorageKeyContent(
@@ -158,7 +158,7 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
     }
 
     override suspend fun storeSecret(name: String, secretBase64: String, keys: List<SharedSecretStorageService.KeyRef>) {
-        withContext(cryptoCoroutineScope.coroutineContext + coroutineDispatchers.main) {
+        withContext(cryptoCoroutineScope.coroutineContext + coroutineDispatchers.computation) {
             val encryptedContents = HashMap<String, EncryptedSecretContent>()
             keys.forEach {
                 val keyId = it.keyId
@@ -174,7 +174,7 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
                             throw SharedSecretStorageError.UnknownAlgorithm(key.keyInfo.content.algorithm ?: "")
                         }
                     }
-                    is KeyInfoResult.Error -> throw key.error
+                    is KeyInfoResult.Error   -> throw key.error
                 }
             }
 
@@ -213,7 +213,8 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
                 secretKey.privateKey,
                 ByteArray(32) { 0.toByte() },
                 secretName.toByteArray(),
-                64)
+                64
+        )
 
         // The first 32 bytes are used as the AES key, and the next 32 bytes are used as the MAC key
         val aesKey = pseudoRandomKey.copyOfRange(0, 32)
@@ -255,7 +256,8 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
                 secretKey.privateKey,
                 ByteArray(32) { 0.toByte() },
                 secretName.toByteArray(),
-                64)
+                64
+        )
 
         // The first 32 bytes are used as the AES key, and the next 32 bytes are used as the MAC key
         val aesKey = pseudoRandomKey.copyOfRange(0, 32)
@@ -316,7 +318,7 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
         val algorithm = key.keyInfo.content
         if (SSSS_ALGORITHM_CURVE25519_AES_SHA2 == algorithm.algorithm) {
             val keySpec = secretKey as? RawBytesKeySpec ?: throw SharedSecretStorageError.BadKeyFormat
-            return withContext(cryptoCoroutineScope.coroutineContext + coroutineDispatchers.main) {
+            return withContext(cryptoCoroutineScope.coroutineContext + coroutineDispatchers.computation) {
                 // decrypt from recovery key
                 withOlmDecryption { olmPkDecryption ->
                     olmPkDecryption.setPrivateKey(keySpec.privateKey)
@@ -331,7 +333,7 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
             }
         } else if (SSSS_ALGORITHM_AES_HMAC_SHA2 == algorithm.algorithm) {
             val keySpec = secretKey as? RawBytesKeySpec ?: throw SharedSecretStorageError.BadKeyFormat
-            return withContext(cryptoCoroutineScope.coroutineContext + coroutineDispatchers.main) {
+            return withContext(cryptoCoroutineScope.coroutineContext + coroutineDispatchers.computation) {
                 decryptAesHmacSha2(keySpec, name, secretContent)
             }
         } else {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
index 99adbbfbae..a509315e7a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
@@ -97,6 +97,7 @@ import org.matrix.android.sdk.internal.di.MoshiProvider
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.extensions.clearWith
 import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.util.time.Clock
 import org.matrix.olm.OlmAccount
 import org.matrix.olm.OlmException
 import org.matrix.olm.OlmOutboundGroupSession
@@ -110,7 +111,8 @@ internal class RealmCryptoStore @Inject constructor(
         @CryptoDatabase private val realmConfiguration: RealmConfiguration,
         private val crossSigningKeysMapper: CrossSigningKeysMapper,
         @UserId private val userId: String,
-        @DeviceId private val deviceId: String?
+        @DeviceId private val deviceId: String?,
+        private val clock: Clock,
 ) : IMXCryptoStore {
 
     /* ==========================================================================================
@@ -307,7 +309,7 @@ internal class RealmCryptoStore @Inject constructor(
                         // Add the device
                         Timber.d("Add device ${cryptoDeviceInfo.deviceId} of user $userId")
                         val newEntity = CryptoMapper.mapToEntity(cryptoDeviceInfo)
-                        newEntity.firstTimeSeenLocalTs = System.currentTimeMillis()
+                        newEntity.firstTimeSeenLocalTs = clock.epochMillis()
                         userEntity.devices.add(newEntity)
                     } else {
                         // Update the device
@@ -715,6 +717,7 @@ internal class RealmCryptoStore @Inject constructor(
         return doWithRealm(realmConfiguration) {
             it.where<OlmSessionEntity>()
                     .equalTo(OlmSessionEntityFields.DEVICE_KEY, deviceKey)
+                    .sort(OlmSessionEntityFields.LAST_RECEIVED_MESSAGE_TS, Sort.DESCENDING)
                     .findAll()
                     .mapNotNull { sessionEntity ->
                         sessionEntity.sessionId
@@ -791,7 +794,7 @@ internal class RealmCryptoStore @Inject constructor(
 
                 if (outboundGroupSession != null) {
                     val info = realm.createObject(OutboundGroupSessionInfoEntity::class.java).apply {
-                        creationTime = System.currentTimeMillis()
+                        creationTime = clock.epochMillis()
                         putOutboundGroupSession(outboundGroupSession)
                     }
                     entity.outboundSessionInfo = info
@@ -881,7 +884,8 @@ internal class RealmCryptoStore @Inject constructor(
                 try {
                     val key = OlmInboundGroupSessionEntity.createPrimaryKey(
                             olmInboundGroupSessionWrapper.olmInboundGroupSession?.sessionIdentifier(),
-                            olmInboundGroupSessionWrapper.senderKey)
+                            olmInboundGroupSessionWrapper.senderKey
+                    )
 
                     it.where<OlmInboundGroupSessionEntity>()
                             .equalTo(OlmInboundGroupSessionEntityFields.PRIMARY_KEY, key)
@@ -1056,13 +1060,16 @@ internal class RealmCryptoStore @Inject constructor(
                             localCreationTimestamp = 0
                     )
         }
-        return monarchy.findAllPagedWithChanges(realmDataSourceFactory,
-                LivePagedListBuilder(dataSourceFactory,
+        return monarchy.findAllPagedWithChanges(
+                realmDataSourceFactory,
+                LivePagedListBuilder(
+                        dataSourceFactory,
                         PagedList.Config.Builder()
                                 .setPageSize(20)
                                 .setEnablePlaceholders(false)
                                 .setPrefetchDistance(1)
-                                .build())
+                                .build()
+                )
         )
     }
 
@@ -1071,13 +1078,16 @@ internal class RealmCryptoStore @Inject constructor(
             realm.where<GossipingEventEntity>().sort(GossipingEventEntityFields.AGE_LOCAL_TS, Sort.DESCENDING)
         }
         val dataSourceFactory = realmDataSourceFactory.map { it.toModel() }
-        val trail = monarchy.findAllPagedWithChanges(realmDataSourceFactory,
-                LivePagedListBuilder(dataSourceFactory,
+        val trail = monarchy.findAllPagedWithChanges(
+                realmDataSourceFactory,
+                LivePagedListBuilder(
+                        dataSourceFactory,
                         PagedList.Config.Builder()
                                 .setPageSize(20)
                                 .setEnablePlaceholders(false)
                                 .setPrefetchDistance(1)
-                                .build())
+                                .build()
+                )
         )
         return trail
     }
@@ -1152,7 +1162,7 @@ internal class RealmCryptoStore @Inject constructor(
 
     override fun saveGossipingEvents(events: List<Event>) {
         monarchy.writeAsync { realm ->
-            val now = System.currentTimeMillis()
+            val now = clock.epochMillis()
             events.forEach { event ->
                 val ageLocalTs = event.unsignedData?.age?.let { now - it } ?: now
                 val entity = GossipingEventEntity(
@@ -1325,7 +1335,7 @@ internal class RealmCryptoStore @Inject constructor(
                     .findAll()
                     .mapNotNull { entity ->
                         when (entity.type) {
-                            GossipRequestType.KEY    -> {
+                            GossipRequestType.KEY -> {
                                 IncomingRoomKeyRequest(
                                         userId = entity.otherUserId,
                                         deviceId = entity.otherDeviceId,
@@ -1358,7 +1368,7 @@ internal class RealmCryptoStore @Inject constructor(
                 it.otherUserId = request.userId
                 it.requestId = request.requestId ?: ""
                 it.requestState = GossipingRequestState.PENDING
-                it.localCreationTimestamp = ageLocalTS ?: System.currentTimeMillis()
+                it.localCreationTimestamp = ageLocalTS ?: clock.epochMillis()
                 if (request is IncomingSecretShareRequest) {
                     it.type = GossipRequestType.SECRET
                     it.requestedInfoStr = request.secretName
@@ -1379,7 +1389,7 @@ internal class RealmCryptoStore @Inject constructor(
                     it.otherUserId = request.userId
                     it.requestId = request.requestId ?: ""
                     it.requestState = GossipingRequestState.PENDING
-                    it.localCreationTimestamp = request.localCreationTimestamp ?: System.currentTimeMillis()
+                    it.localCreationTimestamp = request.localCreationTimestamp ?: clock.epochMillis()
                     if (request is IncomingSecretShareRequest) {
                         it.type = GossipRequestType.SECRET
                         it.requestedInfoStr = request.secretName
@@ -1535,13 +1545,16 @@ internal class RealmCryptoStore @Inject constructor(
             it.toOutgoingGossipingRequest() as? OutgoingRoomKeyRequest
                     ?: OutgoingRoomKeyRequest(requestBody = null, requestId = "?", recipients = emptyMap(), state = OutgoingGossipingRequestState.CANCELLED)
         }
-        val trail = monarchy.findAllPagedWithChanges(realmDataSourceFactory,
-                LivePagedListBuilder(dataSourceFactory,
+        val trail = monarchy.findAllPagedWithChanges(
+                realmDataSourceFactory,
+                LivePagedListBuilder(
+                        dataSourceFactory,
                         PagedList.Config.Builder()
                                 .setPageSize(20)
                                 .setEnablePlaceholders(false)
                                 .setPrefetchDistance(1)
-                                .build())
+                                .build()
+                )
         )
         return trail
     }
@@ -1706,7 +1719,7 @@ internal class RealmCryptoStore @Inject constructor(
      * So we need to tidy up a bit
      */
     override fun tidyUpDataBase() {
-        val prevWeekTs = System.currentTimeMillis() - 7 * 24 * 60 * 60 * 1_000
+        val prevWeekTs = clock.epochMillis() - 7 * 24 * 60 * 60 * 1_000
         doRealmTransaction(realmConfiguration) { realm ->
 
             // Only keep one week history
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
index cac6499486..32f24c5d2e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
@@ -33,10 +33,13 @@ import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo
 import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo013
 import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo014
 import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo015
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 import javax.inject.Inject
 
-internal class RealmCryptoStoreMigration @Inject constructor() : RealmMigration {
+internal class RealmCryptoStoreMigration @Inject constructor(
+        private val clock: Clock,
+) : RealmMigration {
     /**
      * Forces all RealmCryptoStoreMigration instances to be equal
      * Avoids Realm throwing when multiple instances of the migration are set
@@ -59,7 +62,7 @@ internal class RealmCryptoStoreMigration @Inject constructor() : RealmMigration
         if (oldVersion < 5) MigrateCryptoTo005(realm).perform()
         if (oldVersion < 6) MigrateCryptoTo006(realm).perform()
         if (oldVersion < 7) MigrateCryptoTo007(realm).perform()
-        if (oldVersion < 8) MigrateCryptoTo008(realm).perform()
+        if (oldVersion < 8) MigrateCryptoTo008(realm, clock).perform()
         if (oldVersion < 9) MigrateCryptoTo009(realm).perform()
         if (oldVersion < 10) MigrateCryptoTo010(realm).perform()
         if (oldVersion < 11) MigrateCryptoTo011(realm).perform()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreModule.kt
index a2f2f8e97a..b4c94a7fd1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreModule.kt
@@ -38,7 +38,8 @@ import org.matrix.android.sdk.internal.crypto.store.db.model.WithHeldSessionEnti
 /**
  * Realm module for Crypto store classes
  */
-@RealmModule(library = true,
+@RealmModule(
+        library = true,
         classes = [
             CryptoMetadataEntity::class,
             CryptoRoomEntity::class,
@@ -57,5 +58,6 @@ import org.matrix.android.sdk.internal.crypto.store.db.model.WithHeldSessionEnti
             WithHeldSessionEntity::class,
             SharedSessionEntity::class,
             OutboundGroupSessionInfoEntity::class
-        ])
+        ]
+)
 internal class RealmCryptoStoreModule
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt
index 5e4b9b96da..8b7bf9c26b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt
@@ -27,11 +27,13 @@ import javax.inject.Inject
 
 internal class CrossSigningKeysMapper @Inject constructor(moshi: Moshi) {
 
-    private val signaturesAdapter = moshi.adapter<Map<String, Map<String, String>>>(Types.newParameterizedType(
-            Map::class.java,
-            String::class.java,
-            Any::class.java
-    ))
+    private val signaturesAdapter = moshi.adapter<Map<String, Map<String, String>>>(
+            Types.newParameterizedType(
+                    Map::class.java,
+                    String::class.java,
+                    Any::class.java
+            )
+    )
 
     fun update(keyInfo: KeyInfoEntity, cryptoCrossSigningKey: CryptoCrossSigningKey) {
         // update signatures?
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo004.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo004.kt
index 52d0124c2b..e5bdd2aa9b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo004.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo004.kt
@@ -72,16 +72,20 @@ internal class MigrateCryptoTo004(realm: DynamicRealm) : RealmMigrator(realm, 4)
                 ?.addField(CryptoMetadataEntityFields.X_SIGN_SELF_SIGNED_PRIVATE_KEY, String::class.java)
 
         val moshi = Moshi.Builder().add(SerializeNulls.JSON_ADAPTER_FACTORY).build()
-        val listMigrationAdapter = moshi.adapter<List<String>>(Types.newParameterizedType(
-                List::class.java,
-                String::class.java,
-                Any::class.java
-        ))
-        val mapMigrationAdapter = moshi.adapter<JsonDict>(Types.newParameterizedType(
-                Map::class.java,
-                String::class.java,
-                Any::class.java
-        ))
+        val listMigrationAdapter = moshi.adapter<List<String>>(
+                Types.newParameterizedType(
+                        List::class.java,
+                        String::class.java,
+                        Any::class.java
+                )
+        )
+        val mapMigrationAdapter = moshi.adapter<JsonDict>(
+                Types.newParameterizedType(
+                        Map::class.java,
+                        String::class.java,
+                        Any::class.java
+                )
+        )
 
         realm.schema.get("DeviceInfoEntity")
                 ?.addField(DeviceInfoEntityFields.USER_ID, String::class.java)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo008.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo008.kt
index 785e6a04f4..ad195e6e55 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo008.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo008.kt
@@ -21,8 +21,12 @@ import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.internal.crypto.store.db.model.DeviceInfoEntityFields
 import org.matrix.android.sdk.internal.crypto.store.db.model.MyDeviceLastSeenInfoEntityFields
 import org.matrix.android.sdk.internal.util.database.RealmMigrator
+import org.matrix.android.sdk.internal.util.time.Clock
 
-internal class MigrateCryptoTo008(realm: DynamicRealm) : RealmMigrator(realm, 8) {
+internal class MigrateCryptoTo008(
+        realm: DynamicRealm,
+        private val clock: Clock,
+) : RealmMigrator(realm, 8) {
 
     override fun doMigrate(realm: DynamicRealm) {
         realm.schema.create("MyDeviceLastSeenInfoEntity")
@@ -33,7 +37,7 @@ internal class MigrateCryptoTo008(realm: DynamicRealm) : RealmMigrator(realm, 8)
                 .addField(MyDeviceLastSeenInfoEntityFields.LAST_SEEN_TS, Long::class.java)
                 .setNullable(MyDeviceLastSeenInfoEntityFields.LAST_SEEN_TS, true)
 
-        val now = System.currentTimeMillis()
+        val now = clock.epochMillis()
         realm.schema.get("DeviceInfoEntity")
                 ?.addField(DeviceInfoEntityFields.FIRST_TIME_SEEN_LOCAL_TS, Long::class.java)
                 ?.setNullable(DeviceInfoEntityFields.FIRST_TIME_SEEN_LOCAL_TS, true)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMapper.kt
index c71d5e73a2..ca41930f80 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMapper.kt
@@ -27,21 +27,27 @@ import timber.log.Timber
 internal object CryptoMapper {
 
     private val moshi = Moshi.Builder().add(SerializeNulls.JSON_ADAPTER_FACTORY).build()
-    private val listMigrationAdapter = moshi.adapter<List<String>>(Types.newParameterizedType(
-            List::class.java,
-            String::class.java,
-            Any::class.java
-    ))
-    private val mapMigrationAdapter = moshi.adapter<JsonDict>(Types.newParameterizedType(
-            Map::class.java,
-            String::class.java,
-            Any::class.java
-    ))
-    private val mapOfStringMigrationAdapter = moshi.adapter<Map<String, Map<String, String>>>(Types.newParameterizedType(
-            Map::class.java,
-            String::class.java,
-            Any::class.java
-    ))
+    private val listMigrationAdapter = moshi.adapter<List<String>>(
+            Types.newParameterizedType(
+                    List::class.java,
+                    String::class.java,
+                    Any::class.java
+            )
+    )
+    private val mapMigrationAdapter = moshi.adapter<JsonDict>(
+            Types.newParameterizedType(
+                    Map::class.java,
+                    String::class.java,
+                    Any::class.java
+            )
+    )
+    private val mapOfStringMigrationAdapter = moshi.adapter<Map<String, Map<String, String>>>(
+            Types.newParameterizedType(
+                    Map::class.java,
+                    String::class.java,
+                    Any::class.java
+            )
+    )
 
     internal fun mapToEntity(deviceInfo: CryptoDeviceInfo): DeviceInfoEntity {
         return DeviceInfoEntity(primaryKey = DeviceInfoEntity.createPrimaryKey(deviceInfo.userId, deviceInfo.deviceId))
@@ -91,11 +97,13 @@ internal object CryptoMapper {
                 },
                 keys = deviceInfoEntity.keysMapJson?.let {
                     try {
-                        moshi.adapter<Map<String, String>>(Types.newParameterizedType(
-                                Map::class.java,
-                                String::class.java,
-                                Any::class.java
-                        )).fromJson(it)
+                        moshi.adapter<Map<String, String>>(
+                                Types.newParameterizedType(
+                                        Map::class.java,
+                                        String::class.java,
+                                        Any::class.java
+                                )
+                        ).fromJson(it)
                     } catch (failure: Throwable) {
                         Timber.e(failure)
                         null
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoRoomEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoRoomEntity.kt
index 6167314b5a..114a596964 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoRoomEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoRoomEntity.kt
@@ -31,8 +31,8 @@ internal open class CryptoRoomEntity(
         // a security to ensure that a room will never revert to not encrypted
         // even if a new state event with empty encryption, or state is reset somehow
         var wasEncryptedOnce: Boolean? = false
-        ) :
-    RealmObject() {
+) :
+        RealmObject() {
 
     companion object
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmInboundGroupSessionEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmInboundGroupSessionEntity.kt
index f330e8822a..83671b28d9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmInboundGroupSessionEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmInboundGroupSessionEntity.kt
@@ -34,7 +34,7 @@ internal open class OlmInboundGroupSessionEntity(
         var olmInboundGroupSessionData: String? = null,
         // Indicate if the key has been backed up to the homeserver
         var backedUp: Boolean = false) :
-    RealmObject() {
+        RealmObject() {
 
     fun getInboundGroupSession(): OlmInboundGroupSessionWrapper2? {
         return try {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmSessionEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmSessionEntity.kt
index 0b69311c57..1a637d76c4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmSessionEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmSessionEntity.kt
@@ -30,7 +30,7 @@ internal open class OlmSessionEntity(@PrimaryKey var primaryKey: String = "",
                                      var deviceKey: String? = null,
                                      var olmSessionData: String? = null,
                                      var lastReceivedMessageTs: Long = 0) :
-    RealmObject() {
+        RealmObject() {
 
     fun getOlmSession(): OlmSession? {
         return deserializeFromRealm(olmSessionData)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt
index ca04bac5d5..0a77d33acc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt
@@ -18,6 +18,7 @@ package org.matrix.android.sdk.internal.crypto.tasks
 
 import org.matrix.android.sdk.api.auth.UIABaseAuth
 import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
+import org.matrix.android.sdk.api.session.uia.UiaResult
 import org.matrix.android.sdk.internal.auth.registration.handleUIA
 import org.matrix.android.sdk.internal.crypto.api.CryptoApi
 import org.matrix.android.sdk.internal.crypto.model.rest.DeleteDeviceParams
@@ -47,13 +48,13 @@ internal class DefaultDeleteDeviceTask @Inject constructor(
             }
         } catch (throwable: Throwable) {
             if (params.userInteractiveAuthInterceptor == null ||
-                    !handleUIA(
+                    handleUIA(
                             failure = throwable,
                             interceptor = params.userInteractiveAuthInterceptor,
                             retryBlock = { authUpdate ->
                                 execute(params.copy(userAuthParam = authUpdate))
                             }
-                    )
+                    ) != UiaResult.SUCCESS
             ) {
                 Timber.d("## UIA: propagate failure")
                 throw throwable
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt
index eefdd25044..53190c43ff 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt
@@ -20,6 +20,7 @@ import dagger.Lazy
 import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
 import org.matrix.android.sdk.api.session.crypto.crosssigning.CryptoCrossSigningKey
 import org.matrix.android.sdk.api.session.crypto.crosssigning.KeyUsage
+import org.matrix.android.sdk.api.session.uia.UiaResult
 import org.matrix.android.sdk.api.util.toBase64NoPadding
 import org.matrix.android.sdk.internal.auth.registration.handleUIA
 import org.matrix.android.sdk.internal.crypto.MXOlmDevice
@@ -126,13 +127,13 @@ internal class DefaultInitializeCrossSigningTask @Inject constructor(
                 uploadSigningKeysTask.execute(uploadSigningKeysParams)
             } catch (failure: Throwable) {
                 if (params.interactiveAuthInterceptor == null ||
-                        !handleUIA(
+                        handleUIA(
                                 failure = failure,
                                 interceptor = params.interactiveAuthInterceptor,
                                 retryBlock = { authUpdate ->
                                     uploadSigningKeysTask.execute(uploadSigningKeysParams.copy(userAuthParam = authUpdate))
                                 }
-                        )
+                        ) != UiaResult.SUCCESS
                 ) {
                     Timber.d("## UIA: propagate failure")
                     throw failure
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
index bdfe818c62..14674ef258 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
@@ -73,11 +73,13 @@ internal class DefaultSendEventTask @Inject constructor(
     @Throws
     private suspend fun handleEncryption(params: SendEventTask.Params): Event {
         if (params.encrypt && !params.event.isEncrypted()) {
-            return encryptEventTask.execute(EncryptEventTask.Params(
-                    params.event.roomId ?: "",
-                    params.event,
-                    listOf("m.relates_to")
-            ))
+            return encryptEventTask.execute(
+                    EncryptEventTask.Params(
+                            params.event.roomId ?: "",
+                            params.event,
+                            listOf("m.relates_to")
+                    )
+            )
         }
         return params.event
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
index c4a6ba27d6..44aa6d9db1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
@@ -64,11 +64,13 @@ internal class DefaultSendVerificationMessageTask @Inject constructor(
     private suspend fun handleEncryption(params: SendVerificationMessageTask.Params): Event {
         if (cryptoSessionInfoProvider.isRoomEncrypted(params.event.roomId ?: "")) {
             try {
-                return encryptEventTask.execute(EncryptEventTask.Params(
-                        params.event.roomId ?: "",
-                        params.event,
-                        listOf("m.relates_to")
-                ))
+                return encryptEventTask.execute(
+                        EncryptEventTask.Params(
+                                params.event.roomId ?: "",
+                                params.event,
+                                listOf("m.relates_to")
+                        )
+                )
             } catch (throwable: Throwable) {
                 // We said it's ok to send verification request in clear
             }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultIncomingSASDefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultIncomingSASDefaultVerificationTransaction.kt
index 68f1cf62d5..8ecb68560b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultIncomingSASDefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultIncomingSASDefaultVerificationTransaction.kt
@@ -53,7 +53,8 @@ internal class DefaultIncomingSASDefaultVerificationTransaction(
         transactionId,
         otherUserID,
         null,
-        isIncoming = true),
+        isIncoming = true
+),
         IncomingSasVerificationTransaction {
 
     override val uxState: IncomingSasVerificationTransaction.UxState
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt
index e203f03b06..4bdf414295 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt
@@ -50,7 +50,8 @@ internal class DefaultOutgoingSASDefaultVerificationTransaction(
         transactionId,
         otherUserId,
         otherDeviceId,
-        isIncoming = false),
+        isIncoming = false
+),
         OutgoingSasVerificationTransaction {
 
     override val uxState: OutgoingSasVerificationTransaction.UxState
@@ -123,7 +124,7 @@ internal class DefaultOutgoingSASDefaultVerificationTransaction(
 //        val requestMessage = KeyVerificationRequest(
 //                fromDevice = session.sessionParams.deviceId ?: "",
 //                methods = listOf(KeyVerificationStart.VERIF_METHOD_SAS),
-//                timestamp = System.currentTimeMillis().toInt(),
+//                timestamp = clock.epochMillis().toInt(),
 //                transactionId = transactionId
 //        )
 //
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt
index 28bf1d70f7..d62ca5503d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt
@@ -84,6 +84,7 @@ import org.matrix.android.sdk.internal.di.DeviceId
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.SessionScope
 import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 import java.util.UUID
 import javax.inject.Inject
@@ -104,7 +105,8 @@ internal class DefaultVerificationService @Inject constructor(
         private val verificationTransportToDeviceFactory: VerificationTransportToDeviceFactory,
         private val crossSigningService: CrossSigningService,
         private val cryptoCoroutineScope: CoroutineScope,
-        private val taskExecutor: TaskExecutor
+        private val taskExecutor: TaskExecutor,
+        private val clock: Clock,
 ) : DefaultVerificationTransaction.Listener, VerificationService {
 
     private val uiHandler = Handler(Looper.getMainLooper())
@@ -261,9 +263,11 @@ internal class DefaultVerificationService @Inject constructor(
     }
 
     override fun markedLocallyAsManuallyVerified(userId: String, deviceID: String) {
-        setDeviceVerificationAction.handle(DeviceTrustLevel(false, true),
+        setDeviceVerificationAction.handle(
+                DeviceTrustLevel(crossSigningVerified = false, locallyVerified = true),
                 userId,
-                deviceID)
+                deviceID
+        )
 
         listeners.forEach {
             try {
@@ -313,7 +317,7 @@ internal class DefaultVerificationService @Inject constructor(
         val requestsForUser = pendingRequests.getOrPut(senderId) { mutableListOf() }
 
         val pendingVerificationRequest = PendingVerificationRequest(
-                ageLocalTs = event.ageLocalTs ?: System.currentTimeMillis(),
+                ageLocalTs = event.ageLocalTs ?: clock.epochMillis(),
                 isIncoming = true,
                 otherUserId = senderId, // requestInfo.toUserId,
                 roomId = null,
@@ -352,7 +356,7 @@ internal class DefaultVerificationService @Inject constructor(
         val requestsForUser = pendingRequests.getOrPut(senderId) { mutableListOf() }
 
         val pendingVerificationRequest = PendingVerificationRequest(
-                ageLocalTs = event.ageLocalTs ?: System.currentTimeMillis(),
+                ageLocalTs = event.ageLocalTs ?: clock.epochMillis(),
                 isIncoming = true,
                 otherUserId = senderId, // requestInfo.toUserId,
                 roomId = event.roomId,
@@ -552,7 +556,8 @@ internal class DefaultVerificationService @Inject constructor(
                             myDeviceInfoHolder.get().myDevice.fingerprint()!!,
                             startReq.transactionId,
                             otherUserId,
-                            autoAccept).also { txConfigure(it) }
+                            autoAccept
+                    ).also { txConfigure(it) }
                     addTransaction(tx)
                     tx.onVerificationStart(startReq)
                     return null
@@ -644,9 +649,11 @@ internal class DefaultVerificationService @Inject constructor(
 
         if (existingRequest != null) {
             // Mark this request as cancelled
-            updatePendingRequest(existingRequest.copy(
-                    cancelConclusion = safeValueOf(cancelReq.code)
-            ))
+            updatePendingRequest(
+                    existingRequest.copy(
+                            cancelConclusion = safeValueOf(cancelReq.code)
+                    )
+            )
         }
 
         existingTransaction?.state = VerificationTxState.Cancelled(safeValueOf(cancelReq.code), false)
@@ -809,15 +816,19 @@ internal class DefaultVerificationService @Inject constructor(
                             ?.let { vt ->
                                 val otherDeviceId = vt.otherDeviceId
                                 if (!crossSigningService.canCrossSign()) {
-                                    outgoingGossipingRequestManager.sendSecretShareRequest(MASTER_KEY_SSSS_NAME, mapOf(userId to listOf(otherDeviceId
-                                            ?: "*")))
-                                    outgoingGossipingRequestManager.sendSecretShareRequest(SELF_SIGNING_KEY_SSSS_NAME, mapOf(userId to listOf(otherDeviceId
-                                            ?: "*")))
-                                    outgoingGossipingRequestManager.sendSecretShareRequest(USER_SIGNING_KEY_SSSS_NAME, mapOf(userId to listOf(otherDeviceId
-                                            ?: "*")))
+                                    outgoingGossipingRequestManager.sendSecretShareRequest(
+                                            MASTER_KEY_SSSS_NAME, mapOf(userId to listOf(otherDeviceId ?: "*"))
+                                    )
+                                    outgoingGossipingRequestManager.sendSecretShareRequest(
+                                            SELF_SIGNING_KEY_SSSS_NAME, mapOf(userId to listOf(otherDeviceId ?: "*"))
+                                    )
+                                    outgoingGossipingRequestManager.sendSecretShareRequest(
+                                            USER_SIGNING_KEY_SSSS_NAME, mapOf(userId to listOf(otherDeviceId ?: "*"))
+                                    )
                                 }
-                                outgoingGossipingRequestManager.sendSecretShareRequest(KEYBACKUP_SECRET_SSSS_NAME, mapOf(userId to listOf(otherDeviceId
-                                        ?: "*")))
+                                outgoingGossipingRequestManager.sendSecretShareRequest(
+                                        KEYBACKUP_SECRET_SSSS_NAME, mapOf(userId to listOf(otherDeviceId ?: "*"))
+                                )
                             }
         }
     }
@@ -917,16 +928,19 @@ internal class DefaultVerificationService @Inject constructor(
                     qrCodeData = qrCodeData,
                     userId = userId,
                     deviceId = deviceId ?: "",
-                    isIncoming = false)
+                    isIncoming = false
+            )
 
             tx.transport = transportCreator.invoke(tx)
 
             addTransaction(tx)
         }
 
-        updatePendingRequest(existingRequest.copy(
-                readyInfo = readyReq
-        ))
+        updatePendingRequest(
+                existingRequest.copy(
+                        readyInfo = readyReq
+                )
+        )
     }
 
     private fun createQrCodeData(requestId: String?, otherUserId: String, otherDeviceId: String?): QrCodeData? {
@@ -1115,7 +1129,8 @@ internal class DefaultVerificationService @Inject constructor(
                     myDeviceInfoHolder.get().myDevice.fingerprint()!!,
                     txID,
                     otherUserId,
-                    otherDeviceId)
+                    otherDeviceId
+            )
             tx.transport = verificationTransportToDeviceFactory.createTransport(tx)
             addTransaction(tx)
 
@@ -1150,7 +1165,7 @@ internal class DefaultVerificationService @Inject constructor(
         val validLocalId = localId ?: LocalEcho.createLocalEchoId()
 
         val verificationRequest = PendingVerificationRequest(
-                ageLocalTs = System.currentTimeMillis(),
+                ageLocalTs = clock.epochMillis(),
                 isIncoming = false,
                 roomId = roomId,
                 localId = validLocalId,
@@ -1175,11 +1190,13 @@ internal class DefaultVerificationService @Inject constructor(
 
         transport.sendVerificationRequest(methodValues, validLocalId, otherUserId, roomId, null) { syncedId, info ->
             // We need to update with the syncedID
-            updatePendingRequest(verificationRequest.copy(
-                    transactionId = syncedId,
-                    // localId stays different
-                    requestInfo = info
-            ))
+            updatePendingRequest(
+                    verificationRequest.copy(
+                            transactionId = syncedId,
+                            // localId stays different
+                            requestInfo = info
+                    )
+            )
         }
 
         requestsForUser.add(verificationRequest)
@@ -1228,7 +1245,7 @@ internal class DefaultVerificationService @Inject constructor(
 
         val verificationRequest = PendingVerificationRequest(
                 transactionId = localId,
-                ageLocalTs = System.currentTimeMillis(),
+                ageLocalTs = clock.epochMillis(),
                 isIncoming = false,
                 roomId = null,
                 localId = localId,
@@ -1254,10 +1271,12 @@ internal class DefaultVerificationService @Inject constructor(
 
         transport.sendVerificationRequest(methodValues, localId, otherUserId, null, targetDevices) { _, info ->
             // Nothing special to do in to device mode
-            updatePendingRequest(verificationRequest.copy(
-                    // localId stays different
-                    requestInfo = info
-            ))
+            updatePendingRequest(
+                    verificationRequest.copy(
+                            // localId stays different
+                            requestInfo = info
+                    )
+            )
         }
 
         requestsForUser.add(verificationRequest)
@@ -1271,9 +1290,11 @@ internal class DefaultVerificationService @Inject constructor(
                 .cancelTransaction(transactionId, otherUserId, null, CancelCode.User)
 
         getExistingVerificationRequest(otherUserId, transactionId)?.let {
-            updatePendingRequest(it.copy(
-                    cancelConclusion = CancelCode.User
-            ))
+            updatePendingRequest(
+                    it.copy(
+                            cancelConclusion = CancelCode.User
+                    )
+            )
         }
     }
 
@@ -1307,7 +1328,8 @@ internal class DefaultVerificationService @Inject constructor(
                     myDeviceInfoHolder.get().myDevice.fingerprint()!!,
                     transactionId,
                     otherUserId,
-                    otherDeviceId)
+                    otherDeviceId
+            )
             tx.transport = verificationTransportRoomMessageFactory.createTransport(roomId, tx)
             addTransaction(tx)
 
@@ -1333,7 +1355,8 @@ internal class DefaultVerificationService @Inject constructor(
                     otherUserId,
                     existingRequest.requestInfo?.fromDevice ?: "",
                     existingRequest.requestInfo?.methods,
-                    methods) {
+                    methods
+            ) {
                 verificationTransportRoomMessageFactory.createTransport(roomId, it)
             }
             if (methods.isNullOrEmpty()) {
@@ -1343,7 +1366,8 @@ internal class DefaultVerificationService @Inject constructor(
             }
             // TODO this is not yet related to a transaction, maybe we should use another method like for cancel?
             val readyMsg = transport.createReady(transactionId, deviceId ?: "", computedMethods)
-            transport.sendToOther(EventType.KEY_VERIFICATION_READY,
+            transport.sendToOther(
+                    EventType.KEY_VERIFICATION_READY,
                     readyMsg,
                     VerificationTxState.None,
                     CancelCode.User,
@@ -1372,7 +1396,8 @@ internal class DefaultVerificationService @Inject constructor(
                     otherUserId,
                     existingRequest.requestInfo?.fromDevice ?: "",
                     existingRequest.requestInfo?.methods,
-                    methods) {
+                    methods
+            ) {
                 verificationTransportToDeviceFactory.createTransport(it)
             }
             if (methods.isNullOrEmpty()) {
@@ -1446,7 +1471,8 @@ internal class DefaultVerificationService @Inject constructor(
                         qrCodeData = qrCodeData,
                         userId = userId,
                         deviceId = deviceId ?: "",
-                        isIncoming = false)
+                        isIncoming = false
+                )
 
                 tx.transport = transportCreator.invoke(tx)
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt
index 69d9388c5f..692ddd0148 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt
@@ -105,8 +105,10 @@ internal abstract class DefaultVerificationTransaction(
 
     private fun setDeviceVerified(userId: String, deviceId: String) {
         // TODO should not override cross sign status
-        setDeviceVerificationAction.handle(DeviceTrustLevel(crossSigningVerified = false, locallyVerified = true),
+        setDeviceVerificationAction.handle(
+                DeviceTrustLevel(crossSigningVerified = false, locallyVerified = true),
                 userId,
-                deviceId)
+                deviceId
+        )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
index 4bf01a2809..00069ba122 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
@@ -58,7 +58,8 @@ internal abstract class SASDefaultVerificationTransaction(
         transactionId,
         otherUserId,
         otherDeviceId,
-        isIncoming),
+        isIncoming
+),
         SasVerificationTransaction {
 
     companion object {
@@ -297,9 +298,11 @@ internal abstract class SASDefaultVerificationTransaction(
             return
         }
 
-        trust(otherMasterKeyIsVerified,
+        trust(
+                otherMasterKeyIsVerified,
                 verifiedDevices,
-                eventuallyMarkMyMasterKeyAsTrusted = otherMasterKey?.trustLevel?.isVerified() == false)
+                eventuallyMarkMyMasterKeyAsTrusted = otherMasterKey?.trustLevel?.isVerified() == false
+        )
     }
 
     override fun cancel() {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SendVerificationMessageWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SendVerificationMessageWorker.kt
index a763c05e07..0a175ae3ca 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SendVerificationMessageWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SendVerificationMessageWorker.kt
@@ -35,7 +35,7 @@ import javax.inject.Inject
  * Possible next worker    : None
  */
 internal class SendVerificationMessageWorker(context: Context, params: WorkerParameters, sessionManager: SessionManager) :
-    SessionSafeCoroutineWorker<SendVerificationMessageWorker.Params>(context, params, sessionManager, Params::class.java) {
+        SessionSafeCoroutineWorker<SendVerificationMessageWorker.Params>(context, params, sessionManager, Params::class.java) {
 
     @JsonClass(generateAdapter = true)
     internal data class Params(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationMessageProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationMessageProcessor.kt
index 52166761ab..ec4e1aa65c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationMessageProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationMessageProcessor.kt
@@ -34,11 +34,13 @@ import org.matrix.android.sdk.internal.database.model.EventInsertType
 import org.matrix.android.sdk.internal.di.DeviceId
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.EventInsertLiveProcessor
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 import javax.inject.Inject
 
 internal class VerificationMessageProcessor @Inject constructor(
         private val eventDecryptor: EventDecryptor,
+        private val clock: Clock,
         private val verificationService: DefaultVerificationService,
         @UserId private val userId: String,
         @DeviceId private val deviceId: String?
@@ -71,8 +73,7 @@ internal class VerificationMessageProcessor @Inject constructor(
         // If the request is in the future by more than 5 minutes or more than 10 minutes in the past,
         // the message should be ignored by the receiver.
 
-        if (!VerificationService.isValidRequest(event.ageLocalTs
-                        ?: event.originServerTs)) return Unit.also {
+        if (!VerificationService.isValidRequest(event.ageLocalTs ?: event.originServerTs, clock.epochMillis())) return Unit.also {
             Timber.d("## SAS Verification live observer: msgId: ${event.eventId} is outdated")
         }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
index bd1186908c..325a6f0ba2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
@@ -47,6 +47,7 @@ import org.matrix.android.sdk.internal.crypto.model.rest.VERIFICATION_METHOD_REC
 import org.matrix.android.sdk.internal.crypto.model.rest.VERIFICATION_METHOD_SAS
 import org.matrix.android.sdk.internal.di.WorkManagerProvider
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory
+import org.matrix.android.sdk.internal.util.time.Clock
 import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker
 import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
 import timber.log.Timber
@@ -61,7 +62,8 @@ internal class VerificationTransportRoomMessage(
         private val roomId: String,
         private val localEchoEventFactory: LocalEchoEventFactory,
         private val tx: DefaultVerificationTransaction?,
-        private val coroutineScope: CoroutineScope
+        private val coroutineScope: CoroutineScope,
+        private val clock: Clock,
 ) : VerificationTransport {
 
     override fun <T> sendToOther(type: String,
@@ -77,10 +79,12 @@ internal class VerificationTransportRoomMessage(
                 content = verificationInfo.toEventContent()!!
         )
 
-        val workerParams = WorkerParamsFactory.toData(SendVerificationMessageWorker.Params(
-                sessionId = sessionId,
-                eventId = event.eventId ?: ""
-        ))
+        val workerParams = WorkerParamsFactory.toData(
+                SendVerificationMessageWorker.Params(
+                        sessionId = sessionId,
+                        eventId = event.eventId ?: ""
+                )
+        )
         val enqueueInfo = enqueueSendWork(workerParams)
 
         // I cannot just listen to the given work request, because when used in a uniqueWork,
@@ -155,7 +159,7 @@ internal class VerificationTransportRoomMessage(
                 transactionId = "",
                 fromDevice = userDeviceId ?: "",
                 methods = supportedMethods,
-                timestamp = System.currentTimeMillis()
+                timestamp = clock.epochMillis()
         )
 
         val info = MessageVerificationRequestContent(
@@ -175,10 +179,12 @@ internal class VerificationTransportRoomMessage(
                 content
         )
 
-        val workerParams = WorkerParamsFactory.toData(SendVerificationMessageWorker.Params(
-                sessionId = sessionId,
-                eventId = event.eventId ?: ""
-        ))
+        val workerParams = WorkerParamsFactory.toData(
+                SendVerificationMessageWorker.Params(
+                        sessionId = sessionId,
+                        eventId = event.eventId ?: ""
+                )
+        )
 
         val workRequest = workManagerProvider.matrixOneTimeWorkRequestBuilder<SendVerificationMessageWorker>()
                 .setConstraints(WorkManagerProvider.workConstraints)
@@ -230,10 +236,12 @@ internal class VerificationTransportRoomMessage(
                 roomId = roomId,
                 content = MessageVerificationCancelContent.create(transactionId, code).toContent()
         )
-        val workerParams = WorkerParamsFactory.toData(SendVerificationMessageWorker.Params(
-                sessionId = sessionId,
-                eventId = event.eventId ?: ""
-        ))
+        val workerParams = WorkerParamsFactory.toData(
+                SendVerificationMessageWorker.Params(
+                        sessionId = sessionId,
+                        eventId = event.eventId ?: ""
+                )
+        )
         enqueueSendWork(workerParams)
     }
 
@@ -250,10 +258,12 @@ internal class VerificationTransportRoomMessage(
                         )
                 ).toContent()
         )
-        val workerParams = WorkerParamsFactory.toData(SendVerificationMessageWorker.Params(
-                sessionId = sessionId,
-                eventId = event.eventId ?: ""
-        ))
+        val workerParams = WorkerParamsFactory.toData(
+                SendVerificationMessageWorker.Params(
+                        sessionId = sessionId,
+                        eventId = event.eventId ?: ""
+                )
+        )
         val enqueueInfo = enqueueSendWork(workerParams)
 
         val workLiveData = workManagerProvider.workManager
@@ -296,13 +306,13 @@ internal class VerificationTransportRoomMessage(
                               messageAuthenticationCode: String,
                               shortAuthenticationStrings: List<String>): VerificationInfoAccept =
             MessageVerificationAcceptContent.create(
-            tid,
-            keyAgreementProtocol,
-            hash,
-            commitment,
-            messageAuthenticationCode,
-            shortAuthenticationStrings
-    )
+                    tid,
+                    keyAgreementProtocol,
+                    hash,
+                    commitment,
+                    messageAuthenticationCode,
+                    shortAuthenticationStrings
+            )
 
     override fun createKey(tid: String, pubKey: String): VerificationInfoKey = MessageVerificationKeyContent.create(tid, pubKey)
 
@@ -361,7 +371,7 @@ internal class VerificationTransportRoomMessage(
     private fun createEventAndLocalEcho(localId: String = LocalEcho.createLocalEchoId(), type: String, roomId: String, content: Content): Event {
         return Event(
                 roomId = roomId,
-                originServerTs = System.currentTimeMillis(),
+                originServerTs = clock.epochMillis(),
                 senderId = userId,
                 eventId = localId,
                 type = type,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessageFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessageFactory.kt
index f89127273b..b1b7ad7a98 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessageFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessageFactory.kt
@@ -22,6 +22,7 @@ import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.di.WorkManagerProvider
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory
 import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.util.time.Clock
 import javax.inject.Inject
 
 internal class VerificationTransportRoomMessageFactory @Inject constructor(
@@ -33,17 +34,21 @@ internal class VerificationTransportRoomMessageFactory @Inject constructor(
         @DeviceId
         private val deviceId: String?,
         private val localEchoEventFactory: LocalEchoEventFactory,
-        private val taskExecutor: TaskExecutor
+        private val taskExecutor: TaskExecutor,
+        private val clock: Clock,
 ) {
 
     fun createTransport(roomId: String, tx: DefaultVerificationTransaction?): VerificationTransportRoomMessage {
-        return VerificationTransportRoomMessage(workManagerProvider,
+        return VerificationTransportRoomMessage(
+                workManagerProvider,
                 sessionId,
                 userId,
                 deviceId,
                 roomId,
                 localEchoEventFactory,
                 tx,
-                taskExecutor.executorScope)
+                taskExecutor.executorScope,
+                clock
+        )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt
index 40deda2745..bc24ef2966 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt
@@ -35,13 +35,16 @@ import org.matrix.android.sdk.internal.crypto.model.rest.VERIFICATION_METHOD_SAS
 import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.task.configureWith
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 
+// TODO var could be val
 internal class VerificationTransportToDevice(
         private var tx: DefaultVerificationTransaction?,
         private var sendToDeviceTask: SendToDeviceTask,
         private val myDeviceId: String?,
-        private var taskExecutor: TaskExecutor
+        private var taskExecutor: TaskExecutor,
+        private val clock: Clock,
 ) : VerificationTransport {
 
     override fun sendVerificationRequest(supportedMethods: List<String>,
@@ -56,7 +59,7 @@ internal class VerificationTransportToDevice(
                 transactionId = localId,
                 fromDevice = myDeviceId ?: "",
                 methods = supportedMethods,
-                timestamp = System.currentTimeMillis()
+                timestamp = clock.epochMillis()
         )
         val keyReq = KeyVerificationRequest(
                 fromDevice = validKeyReq.fromDevice,
@@ -201,7 +204,8 @@ internal class VerificationTransportToDevice(
             hash,
             commitment,
             messageAuthenticationCode,
-            shortAuthenticationStrings)
+            shortAuthenticationStrings
+    )
 
     override fun createKey(tid: String, pubKey: String): VerificationInfoKey = KeyVerificationKey.create(tid, pubKey)
 
@@ -221,7 +225,8 @@ internal class VerificationTransportToDevice(
                 hashes,
                 messageAuthenticationCodes,
                 shortAuthenticationStrings,
-                null)
+                null
+        )
     }
 
     override fun createStartForQrCode(fromDevice: String,
@@ -235,7 +240,8 @@ internal class VerificationTransportToDevice(
                 null,
                 null,
                 null,
-                sharedSecret)
+                sharedSecret
+        )
     }
 
     override fun createReady(tid: String, fromDevice: String, methods: List<String>): VerificationInfoReady {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDeviceFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDeviceFactory.kt
index e9a2c65ef7..312d911822 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDeviceFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDeviceFactory.kt
@@ -19,14 +19,17 @@ package org.matrix.android.sdk.internal.crypto.verification
 import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
 import org.matrix.android.sdk.internal.di.DeviceId
 import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.util.time.Clock
 import javax.inject.Inject
 
 internal class VerificationTransportToDeviceFactory @Inject constructor(
         private val sendToDeviceTask: SendToDeviceTask,
         @DeviceId val myDeviceId: String?,
-        private val taskExecutor: TaskExecutor) {
+        private val taskExecutor: TaskExecutor,
+        private val clock: Clock,
+) {
 
     fun createTransport(tx: DefaultVerificationTransaction?): VerificationTransportToDevice {
-        return VerificationTransportToDevice(tx, sendToDeviceTask, myDeviceId, taskExecutor)
+        return VerificationTransportToDevice(tx, sendToDeviceTask, myDeviceId, taskExecutor, clock)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/DefaultQrCodeVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/DefaultQrCodeVerificationTransaction.kt
index 06f0b36798..1793cd123b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/DefaultQrCodeVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/DefaultQrCodeVerificationTransaction.kt
@@ -54,7 +54,8 @@ internal class DefaultQrCodeVerificationTransaction(
         transactionId,
         otherUserId,
         otherDeviceId,
-        isIncoming),
+        isIncoming
+),
         QrCodeVerificationTransaction {
 
     override val qrCodeText: String?
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeData.kt
index 0ac57db9bc..34a9525194 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeData.kt
@@ -56,7 +56,8 @@ internal sealed class QrCodeData(
             transactionId,
             userMasterCrossSigningPublicKey,
             otherUserMasterCrossSigningPublicKey,
-            sharedSecret)
+            sharedSecret
+    )
 
     /**
      * self-verifying in which the current device does trust the master key
@@ -77,7 +78,8 @@ internal sealed class QrCodeData(
             transactionId,
             userMasterCrossSigningPublicKey,
             otherDeviceKey,
-            sharedSecret)
+            sharedSecret
+    )
 
     /**
      * self-verifying in which the current device does not yet trust the master key
@@ -98,5 +100,6 @@ internal sealed class QrCodeData(
             transactionId,
             deviceKey,
             userMasterCrossSigningPublicKey,
-            sharedSecret)
+            sharedSecret
+    )
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/AsyncTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/AsyncTransaction.kt
index 315d77d932..7d263f1937 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/AsyncTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/AsyncTransaction.kt
@@ -24,6 +24,7 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import timber.log.Timber
+import kotlin.system.measureTimeMillis
 
 internal fun <T> CoroutineScope.asyncTransaction(monarchy: Monarchy, transaction: suspend (realm: Realm) -> T) {
     asyncTransaction(monarchy.realmConfiguration, transaction)
@@ -41,13 +42,13 @@ internal suspend fun <T> awaitTransaction(config: RealmConfiguration, transactio
             bgRealm.beginTransaction()
             val result: T
             try {
-                val start = System.currentTimeMillis()
-                result = transaction(bgRealm)
-                if (isActive) {
-                    bgRealm.commitTransaction()
-                    val end = System.currentTimeMillis()
-                    val time = end - start
-                    Timber.v("Execute transaction in $time millis")
+                measureTimeMillis {
+                    result = transaction(bgRealm)
+                    if (isActive) {
+                        bgRealm.commitTransaction()
+                    }
+                }.also {
+                    Timber.v("Execute transaction in $it millis")
                 }
             } finally {
                 if (bgRealm.isInTransaction) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt
index 115025cc7d..751992fa7f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt
@@ -19,6 +19,9 @@ package org.matrix.android.sdk.internal.database
 import com.zhuinden.monarchy.Monarchy
 import io.realm.RealmConfiguration
 import io.realm.RealmResults
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.internal.database.mapper.asDomain
 import org.matrix.android.sdk.internal.database.model.EventEntity
@@ -32,16 +35,28 @@ import javax.inject.Inject
 
 internal class EventInsertLiveObserver @Inject constructor(@SessionDatabase realmConfiguration: RealmConfiguration,
                                                            private val processors: Set<@JvmSuppressWildcards EventInsertLiveProcessor>) :
-    RealmLiveEntityObserver<EventInsertEntity>(realmConfiguration) {
+        RealmLiveEntityObserver<EventInsertEntity>(realmConfiguration) {
 
     override val query = Monarchy.Query {
         it.where(EventInsertEntity::class.java).equalTo(EventInsertEntityFields.CAN_BE_PROCESSED, true)
     }
 
+    private val onResultsChangedFlow = MutableSharedFlow<RealmResults<EventInsertEntity>>()
+
+    init {
+        onResultsChangedFlow
+                .onEach { handleChange(it) }
+                .launchIn(observerScope)
+    }
+
     override fun onChange(results: RealmResults<EventInsertEntity>) {
         if (!results.isLoaded || results.isEmpty()) {
             return
         }
+        observerScope.launch { onResultsChangedFlow.emit(results) }
+    }
+
+    private suspend fun handleChange(results: RealmResults<EventInsertEntity>) {
         val idsToDeleteAfterProcess = ArrayList<String>()
         val filteredEvents = ArrayList<EventInsertEntity>(results.size)
         Timber.v("EventInsertEntity updated with ${results.size} results in db")
@@ -58,30 +73,29 @@ internal class EventInsertLiveObserver @Inject constructor(@SessionDatabase real
             }
             idsToDeleteAfterProcess.add(it.eventId)
         }
-        observerScope.launch {
-            awaitTransaction(realmConfiguration) { realm ->
-                Timber.v("##Transaction: There are ${filteredEvents.size} events to process ")
-                filteredEvents.forEach { eventInsert ->
-                    val eventId = eventInsert.eventId
-                    val event = EventEntity.where(realm, eventId).findFirst()
-                    if (event == null) {
-                        Timber.v("Event $eventId not found")
-                        return@forEach
-                    }
-                    val domainEvent = event.asDomain()
-                    processors.filter {
-                        it.shouldProcess(eventId, domainEvent.getClearType(), eventInsert.insertType)
-                    }.forEach {
-                        it.process(realm, domainEvent)
-                    }
+
+        awaitTransaction(realmConfiguration) { realm ->
+            Timber.v("##Transaction: There are ${filteredEvents.size} events to process ")
+            filteredEvents.forEach { eventInsert ->
+                val eventId = eventInsert.eventId
+                val event = EventEntity.where(realm, eventId).findFirst()
+                if (event == null) {
+                    Timber.v("Event $eventId not found")
+                    return@forEach
+                }
+                val domainEvent = event.asDomain()
+                processors.filter {
+                    it.shouldProcess(eventId, domainEvent.getClearType(), eventInsert.insertType)
+                }.forEach {
+                    it.process(realm, domainEvent)
                 }
-                realm.where(EventInsertEntity::class.java)
-                        .`in`(EventInsertEntityFields.EVENT_ID, idsToDeleteAfterProcess.toTypedArray())
-                        .findAll()
-                        .deleteAllFromRealm()
             }
-            processors.forEach { it.onPostProcess() }
+            realm.where(EventInsertEntity::class.java)
+                    .`in`(EventInsertEntityFields.EVENT_ID, idsToDeleteAfterProcess.toTypedArray())
+                    .findAll()
+                    .deleteAllFromRealm()
         }
+        processors.forEach { it.onPostProcess() }
     }
 
     private fun shouldProcess(eventInsertEntity: EventInsertEntity): Boolean {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt
index 50eb086f9a..f2f88e216b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt
@@ -35,7 +35,7 @@ import java.util.concurrent.atomic.AtomicReference
 internal interface LiveEntityObserver : SessionLifecycleObserver
 
 internal abstract class RealmLiveEntityObserver<T : RealmObject>(protected val realmConfiguration: RealmConfiguration) :
-    LiveEntityObserver, RealmChangeListener<RealmResults<T>> {
+        LiveEntityObserver, RealmChangeListener<RealmResults<T>> {
 
     private companion object {
         val BACKGROUND_HANDLER = createBackgroundHandler("LIVE_ENTITY_BACKGROUND")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionProvider.kt
index 8c62c345d0..e5b5915590 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionProvider.kt
@@ -33,7 +33,7 @@ import kotlin.concurrent.getOrSet
  */
 @SessionScope
 internal class RealmSessionProvider @Inject constructor(@SessionDatabase private val monarchy: Monarchy) :
-    SessionLifecycleObserver {
+        SessionLifecycleObserver {
 
     private val realmThreadLocal = ThreadLocal<Realm>()
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index a57397dad5..04a6e83ea1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -44,6 +44,8 @@ import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo023
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo024
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo025
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo026
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo027
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo028
 import org.matrix.android.sdk.internal.util.Normalizer
 import timber.log.Timber
 import javax.inject.Inject
@@ -58,7 +60,7 @@ internal class RealmSessionStoreMigration @Inject constructor(
     override fun equals(other: Any?) = other is RealmSessionStoreMigration
     override fun hashCode() = 1000
 
-    val schemaVersion = 26L
+    val schemaVersion = 28L
 
     override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
         Timber.d("Migrating Realm Session from $oldVersion to $newVersion")
@@ -89,5 +91,7 @@ internal class RealmSessionStoreMigration @Inject constructor(
         if (oldVersion < 24) MigrateSessionTo024(realm).perform()
         if (oldVersion < 25) MigrateSessionTo025(realm).perform()
         if (oldVersion < 26) MigrateSessionTo026(realm).perform()
+        if (oldVersion < 27) MigrateSessionTo027(realm).perform()
+        if (oldVersion < 28) MigrateSessionTo028(realm).perform()
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt
index 04cf5b78af..03b1948302 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadEventsHelper.kt
@@ -207,8 +207,10 @@ internal fun List<TimelineEvent>.mapEventsWithEdition(realm: Realm, roomId: Stri
                     ?.eventId
                     ?.let { editedEventId ->
                         TimelineEventEntity.where(realm, roomId, eventId = editedEventId).findFirst()?.let { editedEvent ->
-                            it.root.threadDetails = it.root.threadDetails?.copy(lastRootThreadEdition = editedEvent.root?.asDomain()?.getDecryptedTextSummary()
-                                    ?: "(edited)")
+                            it.root.threadDetails = it.root.threadDetails?.copy(
+                                    lastRootThreadEdition = editedEvent.root?.asDomain()?.getDecryptedTextSummary()
+                                            ?: "(edited)"
+                            )
                             it
                         } ?: it
                     } ?: it
@@ -341,7 +343,8 @@ internal fun updateNotificationsNew(roomId: String, realm: Realm, currentUserId:
                     realm = realm,
                     roomId = roomId,
                     rootThreadEventId = eventId,
-                    senderId = currentUserId)
+                    senderId = currentUserId
+            )
             val rootThreadEventEntity = EventEntity.where(realm, eventId).findFirst()
 
             if (isUserParticipating) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadSummaryHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadSummaryHelper.kt
index 24de26eeea..d052a7dea4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadSummaryHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ThreadSummaryHelper.kt
@@ -20,6 +20,7 @@ import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.Sort
 import io.realm.kotlin.createObject
+import kotlinx.coroutines.runBlocking
 import org.matrix.android.sdk.api.session.crypto.CryptoService
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
 import org.matrix.android.sdk.api.session.crypto.model.OlmDecryptionResult
@@ -127,7 +128,7 @@ private fun EventEntity.toTimelineEventEntity(roomMemberContentsByUser: HashMap<
     return timelineEventEntity
 }
 
-internal suspend fun ThreadSummaryEntity.Companion.createOrUpdate(
+internal fun ThreadSummaryEntity.Companion.createOrUpdate(
         threadSummaryType: ThreadSummaryUpdateType,
         realm: Realm,
         roomId: String,
@@ -136,7 +137,8 @@ internal suspend fun ThreadSummaryEntity.Companion.createOrUpdate(
         roomMemberContentsByUser: HashMap<String, RoomMemberContent?>,
         roomEntity: RoomEntity,
         userId: String,
-        cryptoService: CryptoService? = null
+        cryptoService: CryptoService? = null,
+        currentTimeMillis: Long,
 ) {
     when (threadSummaryType) {
         ThreadSummaryUpdateType.REPLACE -> {
@@ -152,11 +154,19 @@ internal suspend fun ThreadSummaryEntity.Companion.createOrUpdate(
                 Timber.i("###THREADS ThreadSummaryHelper REPLACE eventId:${it.rootThreadEventId} ")
             }
 
-            val rootThreadEventEntity = createEventEntity(roomId, rootThreadEvent, realm).also {
-                decryptIfNeeded(cryptoService, it, roomId)
+            val rootThreadEventEntity = createEventEntity(realm, roomId, rootThreadEvent, currentTimeMillis).also {
+                try {
+                    decryptIfNeeded(cryptoService, it, roomId)
+                } catch (e: InterruptedException) {
+                    Timber.i("Decryption got interrupted")
+                }
             }
-            val latestThreadEventEntity = createLatestEventEntity(roomId, rootThreadEvent, roomMemberContentsByUser, realm)?.also {
-                decryptIfNeeded(cryptoService, it, roomId)
+            val latestThreadEventEntity = createLatestEventEntity(realm, roomId, rootThreadEvent, roomMemberContentsByUser, currentTimeMillis)?.also {
+                try {
+                    decryptIfNeeded(cryptoService, it, roomId)
+                } catch (e: InterruptedException) {
+                    Timber.i("Decryption got interrupted")
+                }
             }
             val isUserParticipating = rootThreadEvent.unsignedData.relations.latestThread.isUserParticipating == true || rootThreadEvent.senderId == userId
             roomMemberContentsByUser.addSenderState(realm, roomId, rootThreadEvent.senderId)
@@ -204,14 +214,15 @@ internal suspend fun ThreadSummaryEntity.Companion.createOrUpdate(
     }
 }
 
-private suspend fun decryptIfNeeded(cryptoService: CryptoService?, eventEntity: EventEntity, roomId: String) {
+private fun decryptIfNeeded(cryptoService: CryptoService?, eventEntity: EventEntity, roomId: String) {
     cryptoService ?: return
     val event = eventEntity.asDomain()
     if (event.isEncrypted() && event.mxDecryptionResult == null && event.eventId != null) {
         try {
             Timber.i("###THREADS ThreadSummaryHelper request decryption for eventId:${event.eventId}")
             // Event from sync does not have roomId, so add it to the event first
-            val result = cryptoService.decryptEvent(event.copy(roomId = roomId), "")
+            // note: runBlocking should be used here while we are in realm single thread executor, to avoid thread switching
+            val result = runBlocking { cryptoService.decryptEvent(event.copy(roomId = roomId), "") }
             event.mxDecryptionResult = OlmDecryptionResult(
                     payload = result.clearEvent,
                     senderKey = result.senderCurve25519Key,
@@ -258,8 +269,8 @@ private fun HashMap<String, RoomMemberContent?>.addSenderState(realm: Realm, roo
 /**
  * Create an EventEntity for the root thread event or get an existing one
  */
-private fun createEventEntity(roomId: String, event: Event, realm: Realm): EventEntity {
-    val ageLocalTs = event.unsignedData?.age?.let { System.currentTimeMillis() - it }
+private fun createEventEntity(realm: Realm, roomId: String, event: Event, currentTimeMillis: Long): EventEntity {
+    val ageLocalTs = event.unsignedData?.age?.let { currentTimeMillis - it }
     return event.toEntity(roomId, SendState.SYNCED, ageLocalTs).copyToRealmOrIgnore(realm, EventInsertType.PAGINATION)
 }
 
@@ -268,15 +279,17 @@ private fun createEventEntity(roomId: String, event: Event, realm: Realm): Event
  * state
  */
 private fun createLatestEventEntity(
+        realm: Realm,
         roomId: String,
         rootThreadEvent: Event,
         roomMemberContentsByUser: HashMap<String, RoomMemberContent?>,
-        realm: Realm): EventEntity? {
+        currentTimeMillis: Long,
+): EventEntity? {
     return getLatestEvent(rootThreadEvent)?.let {
         it.senderId?.let { senderId ->
             roomMemberContentsByUser.addSenderState(realm, roomId, senderId)
         }
-        createEventEntity(roomId, it, realm)
+        createEventEntity(realm, roomId, it, currentTimeMillis)
     }
 }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/TimelineEventEntityHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/TimelineEventEntityHelper.kt
index ea508731b1..8a5d08cd30 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/TimelineEventEntityHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/TimelineEventEntityHelper.kt
@@ -19,9 +19,10 @@ package org.matrix.android.sdk.internal.database.helper
 import io.realm.Realm
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
+import org.matrix.android.sdk.internal.database.query.where
 
 internal fun TimelineEventEntity.Companion.nextId(realm: Realm): Long {
-    val currentIdNum = realm.where(TimelineEventEntity::class.java).max(TimelineEventEntityFields.LOCAL_ID)
+    val currentIdNum = TimelineEventEntity.where(realm).max(TimelineEventEntityFields.LOCAL_ID)
     return if (currentIdNum == null) {
         1
     } else {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
index 4a26b4c4bf..c747ad334f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
@@ -25,7 +25,6 @@ import org.matrix.android.sdk.internal.database.model.EventAnnotationsSummaryEnt
 internal object EventAnnotationsSummaryMapper {
     fun map(annotationsSummary: EventAnnotationsSummaryEntity): EventAnnotationsSummary {
         return EventAnnotationsSummary(
-                eventId = annotationsSummary.eventId,
                 reactionsSummary = annotationsSummary.reactionsSummary.toList().map {
                     ReactionAggregatedSummary(
                             it.key,
@@ -50,7 +49,6 @@ internal object EventAnnotationsSummaryMapper {
                         },
                 referencesAggregatedSummary = annotationsSummary.referencesSummaryEntity?.let {
                     ReferencesAggregatedSummary(
-                            it.eventId,
                             ContentMapper.map(it.content),
                             it.sourceEvents.toList(),
                             it.sourceLocalEcho.toList()
@@ -58,8 +56,10 @@ internal object EventAnnotationsSummaryMapper {
                 },
                 pollResponseSummary = annotationsSummary.pollResponseSummary?.let {
                     PollResponseAggregatedSummaryEntityMapper.map(it)
+                },
+                liveLocationShareAggregatedSummary = annotationsSummary.liveLocationShareAggregatedSummary?.let {
+                    LiveLocationShareAggregatedSummaryMapper.map(it)
                 }
-
         )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt
index 3083df062e..bc7d40bf6f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt
@@ -30,13 +30,14 @@ import org.matrix.android.sdk.api.session.threads.ThreadNotificationState
 import org.matrix.android.sdk.internal.database.model.EventEntity
 import org.matrix.android.sdk.internal.di.MoshiProvider
 import timber.log.Timber
+import kotlin.random.Random
 
 internal object EventMapper {
 
     fun map(event: Event, roomId: String): EventEntity {
         val eventEntity = EventEntity()
         // TODO change this as we shouldn't use event everywhere
-        eventEntity.eventId = event.eventId ?: "$$roomId-${System.currentTimeMillis()}-${event.hashCode()}"
+        eventEntity.eventId = event.eventId ?: "$$roomId-${Random.nextLong()}-${event.hashCode()}"
         eventEntity.roomId = event.roomId ?: roomId
         eventEntity.content = ContentMapper.map(event.content)
         eventEntity.prevContent = ContentMapper.map(event.resolvedPrevContent())
@@ -126,7 +127,10 @@ internal fun EventEntity.asDomain(castJsonNumbers: Boolean = false): Event {
     return EventMapper.map(this, castJsonNumbers)
 }
 
-internal fun Event.toEntity(roomId: String, sendState: SendState, ageLocalTs: Long?, contentToInject: String? = null): EventEntity {
+internal fun Event.toEntity(roomId: String,
+                            sendState: SendState,
+                            ageLocalTs: Long?,
+                            contentToInject: String? = null): EventEntity {
     return EventMapper.map(this, roomId).apply {
         this.sendState = sendState
         this.ageLocalTs = ageLocalTs
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/LiveLocationShareAggregatedSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/LiveLocationShareAggregatedSummaryMapper.kt
new file mode 100644
index 0000000000..71b36f88bd
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/LiveLocationShareAggregatedSummaryMapper.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.mapper
+
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.livelocation.LiveLocationShareAggregatedSummary
+import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconLocationDataContent
+import org.matrix.android.sdk.internal.database.model.livelocation.LiveLocationShareAggregatedSummaryEntity
+
+internal object LiveLocationShareAggregatedSummaryMapper {
+
+    fun map(entity: LiveLocationShareAggregatedSummaryEntity): LiveLocationShareAggregatedSummary {
+        return LiveLocationShareAggregatedSummary(
+                isActive = entity.isActive,
+                endOfLiveTimestampMillis = entity.endOfLiveTimestampMillis,
+                lastLocationDataContent = ContentMapper.map(entity.lastLocationContent).toModel<MessageBeaconLocationDataContent>()
+        )
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushConditionMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushConditionMapper.kt
index 5c0a2ba902..6521bf62d9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushConditionMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushConditionMapper.kt
@@ -16,7 +16,7 @@
 
 package org.matrix.android.sdk.internal.database.mapper
 
-import org.matrix.android.sdk.api.pushrules.rest.PushCondition
+import org.matrix.android.sdk.api.session.pushrules.rest.PushCondition
 import org.matrix.android.sdk.internal.database.model.PushConditionEntity
 
 internal object PushConditionMapper {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushRulesMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushRulesMapper.kt
index 12eff8efa1..0b07754126 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushRulesMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushRulesMapper.kt
@@ -17,9 +17,9 @@ package org.matrix.android.sdk.internal.database.mapper
 
 import com.squareup.moshi.Types
 import io.realm.RealmList
-import org.matrix.android.sdk.api.pushrules.Kind
-import org.matrix.android.sdk.api.pushrules.rest.PushCondition
-import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.session.pushrules.Kind
+import org.matrix.android.sdk.api.session.pushrules.rest.PushCondition
+import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
 import org.matrix.android.sdk.internal.database.model.PushRuleEntity
 import org.matrix.android.sdk.internal.di.MoshiProvider
 import timber.log.Timber
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo019.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo019.kt
index d63ef62889..754a66bb4b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo019.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo019.kt
@@ -22,7 +22,7 @@ import org.matrix.android.sdk.internal.util.Normalizer
 import org.matrix.android.sdk.internal.util.database.RealmMigrator
 
 internal class MigrateSessionTo019(realm: DynamicRealm,
-                          private val normalizer: Normalizer) : RealmMigrator(realm, 19) {
+                                   private val normalizer: Normalizer) : RealmMigrator(realm, 19) {
 
     override fun doMigrate(realm: DynamicRealm) {
         realm.schema.get("RoomSummaryEntity")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo027.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo027.kt
new file mode 100644
index 0000000000..fdd8c46d02
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo027.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.migration
+
+import io.realm.DynamicRealm
+import io.realm.FieldAttribute
+import org.matrix.android.sdk.internal.database.model.EventAnnotationsSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.livelocation.LiveLocationShareAggregatedSummaryEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+/**
+ * Migrating to:
+ * Live location sharing aggregated summary
+ */
+internal class MigrateSessionTo027(realm: DynamicRealm) : RealmMigrator(realm, 27) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        val liveLocationSummaryEntity = realm.schema.get("LiveLocationShareAggregatedSummaryEntity")
+                ?: realm.schema.create("LiveLocationShareAggregatedSummaryEntity")
+                        .addField(LiveLocationShareAggregatedSummaryEntityFields.EVENT_ID, String::class.java, FieldAttribute.REQUIRED)
+                        .addField(LiveLocationShareAggregatedSummaryEntityFields.ROOM_ID, String::class.java, FieldAttribute.REQUIRED)
+                        .addField(LiveLocationShareAggregatedSummaryEntityFields.IS_ACTIVE, Boolean::class.java)
+                        .setNullable(LiveLocationShareAggregatedSummaryEntityFields.IS_ACTIVE, true)
+                        .addField(LiveLocationShareAggregatedSummaryEntityFields.END_OF_LIVE_TIMESTAMP_MILLIS, Long::class.java)
+                        .setNullable(LiveLocationShareAggregatedSummaryEntityFields.END_OF_LIVE_TIMESTAMP_MILLIS, true)
+                        .addField(LiveLocationShareAggregatedSummaryEntityFields.LAST_LOCATION_CONTENT, String::class.java)
+                ?: return
+
+        realm.schema.get("EventAnnotationsSummaryEntity")
+                ?.addRealmObjectField(EventAnnotationsSummaryEntityFields.LIVE_LOCATION_SHARE_AGGREGATED_SUMMARY.`$`, liveLocationSummaryEntity)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo028.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo028.kt
new file mode 100644
index 0000000000..1d0c638d7b
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo028.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.database.model.livelocation.LiveLocationShareAggregatedSummaryEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+/**
+ * Migrating to:
+ * Live location sharing aggregated summary
+ */
+internal class MigrateSessionTo028(realm: DynamicRealm) : RealmMigrator(realm, 28) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("LiveLocationShareAggregatedSummaryEntity")
+                ?.takeIf { !it.hasPrimaryKey() }
+                ?.addPrimaryKey(LiveLocationShareAggregatedSummaryEntityFields.EVENT_ID)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt
index 88eb821aa9..822bc1bd8f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt
@@ -24,19 +24,20 @@ import io.realm.annotations.LinkingObjects
 import org.matrix.android.sdk.internal.extensions.assertIsManaged
 import org.matrix.android.sdk.internal.extensions.clearWith
 
-internal open class ChunkEntity(@Index var prevToken: String? = null,
+internal open class ChunkEntity(
+        @Index var prevToken: String? = null,
         // Because of gaps we can have several chunks with nextToken == null
-                                @Index var nextToken: String? = null,
-                                var prevChunk: ChunkEntity? = null,
-                                var nextChunk: ChunkEntity? = null,
-                                var stateEvents: RealmList<EventEntity> = RealmList(),
-                                var timelineEvents: RealmList<TimelineEventEntity> = RealmList(),
+        @Index var nextToken: String? = null,
+        var prevChunk: ChunkEntity? = null,
+        var nextChunk: ChunkEntity? = null,
+        var stateEvents: RealmList<EventEntity> = RealmList(),
+        var timelineEvents: RealmList<TimelineEventEntity> = RealmList(),
         // Only one chunk will have isLastForward == true
-                                @Index var isLastForward: Boolean = false,
-                                @Index var isLastBackward: Boolean = false,
+        @Index var isLastForward: Boolean = false,
+        @Index var isLastBackward: Boolean = false,
         // Threads
-                                @Index var rootThreadEventId: String? = null,
-                                @Index var isLastForwardThread: Boolean = false,
+        @Index var rootThreadEventId: String? = null,
+        @Index var isLastForwardThread: Boolean = false,
 ) : RealmObject() {
 
     fun identifier() = "${prevToken}_$nextToken"
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt
index 3e88130420..c3abd8b028 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt
@@ -18,6 +18,7 @@ package org.matrix.android.sdk.internal.database.model
 import io.realm.RealmList
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
+import org.matrix.android.sdk.internal.database.model.livelocation.LiveLocationShareAggregatedSummaryEntity
 import timber.log.Timber
 
 internal open class EventAnnotationsSummaryEntity(
@@ -27,7 +28,8 @@ internal open class EventAnnotationsSummaryEntity(
         var reactionsSummary: RealmList<ReactionAggregatedSummaryEntity> = RealmList(),
         var editSummary: EditAggregatedSummaryEntity? = null,
         var referencesSummaryEntity: ReferencesAggregatedSummaryEntity? = null,
-        var pollResponseSummary: PollResponseAggregatedSummaryEntity? = null
+        var pollResponseSummary: PollResponseAggregatedSummaryEntity? = null,
+        var liveLocationShareAggregatedSummary: LiveLocationShareAggregatedSummaryEntity? = null,
 ) : RealmObject() {
 
     /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/GroupEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/GroupEntity.kt
index 527f782359..0120bb91d3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/GroupEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/GroupEntity.kt
@@ -25,7 +25,7 @@ import org.matrix.android.sdk.api.session.room.model.Membership
  * Then GetGroupDataTask is called regularly to fetch group information from the homeserver.
  */
 internal open class GroupEntity(@PrimaryKey var groupId: String = "") :
-    RealmObject() {
+        RealmObject() {
 
     private var membershipStr: String = Membership.NONE.name
     var membership: Membership
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRulesEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRulesEntity.kt
index 4125d90891..62bf40c1d2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRulesEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRulesEntity.kt
@@ -17,7 +17,7 @@ package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmList
 import io.realm.RealmObject
-import org.matrix.android.sdk.api.pushrules.RuleKind
+import org.matrix.android.sdk.api.session.pushrules.RuleKind
 import org.matrix.android.sdk.internal.extensions.clearWith
 
 internal open class PushRulesEntity(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt
index 4a6f6a7bf8..d8e6b8af0f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt
@@ -48,8 +48,10 @@ internal open class RoomEntity(@PrimaryKey var roomId: String = "",
         set(value) {
             membersLoadStatusStr = value.name
         }
+
     companion object
 }
+
 internal fun RoomEntity.removeThreadSummaryIfNeeded(eventId: String) {
     assertIsManaged()
     threadSummaries.findRootOrLatest(eventId)?.let {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
index d0d23dd491..be5a500956 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
@@ -17,13 +17,15 @@
 package org.matrix.android.sdk.internal.database.model
 
 import io.realm.annotations.RealmModule
+import org.matrix.android.sdk.internal.database.model.livelocation.LiveLocationShareAggregatedSummaryEntity
 import org.matrix.android.sdk.internal.database.model.presence.UserPresenceEntity
 import org.matrix.android.sdk.internal.database.model.threads.ThreadSummaryEntity
 
 /**
  * Realm module for Session
  */
-@RealmModule(library = true,
+@RealmModule(
+        library = true,
         classes = [
             ChunkEntity::class,
             EventEntity::class,
@@ -47,6 +49,7 @@ import org.matrix.android.sdk.internal.database.model.threads.ThreadSummaryEntit
             EditAggregatedSummaryEntity::class,
             EditionOfEvent::class,
             PollResponseAggregatedSummaryEntity::class,
+            LiveLocationShareAggregatedSummaryEntity::class,
             ReferencesAggregatedSummaryEntity::class,
             PushRulesEntity::class,
             PushRuleEntity::class,
@@ -69,5 +72,6 @@ import org.matrix.android.sdk.internal.database.model.threads.ThreadSummaryEntit
             SpaceParentSummaryEntity::class,
             UserPresenceEntity::class,
             ThreadSummaryEntity::class
-        ])
+        ]
+)
 internal class SessionRealmModule
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt
index aacd6570bc..477c04fe51 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt
@@ -32,8 +32,8 @@ internal open class TimelineEventEntity(var localId: Long = 0,
                                         var isUniqueDisplayName: Boolean = false,
                                         var senderAvatar: String? = null,
                                         var senderMembershipEventId: String? = null,
-                                        // ownedByThreadChunk indicates that the current TimelineEventEntity belongs
-                                        // to a thread chunk and is a temporarily event.
+        // ownedByThreadChunk indicates that the current TimelineEventEntity belongs
+        // to a thread chunk and is a temporarily event.
                                         var ownedByThreadChunk: Boolean = false,
                                         var readReceipts: ReadReceiptsSummaryEntity? = null
 ) : RealmObject() {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/livelocation/LiveLocationShareAggregatedSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/livelocation/LiveLocationShareAggregatedSummaryEntity.kt
new file mode 100644
index 0000000000..1376839f93
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/livelocation/LiveLocationShareAggregatedSummaryEntity.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.model.livelocation
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+/**
+ * Aggregation info concerning a live location share.
+ */
+internal open class LiveLocationShareAggregatedSummaryEntity(
+        /**
+         * Event id of the event that started the live.
+         */
+        @PrimaryKey
+        var eventId: String = "",
+
+        var roomId: String = "",
+
+        var isActive: Boolean? = null,
+
+        var endOfLiveTimestampMillis: Long? = null,
+
+        /**
+         * For now we persist this as a JSON for greater flexibility
+         * @see [org.matrix.android.sdk.api.session.room.model.message.MessageBeaconLocationDataContent]
+         */
+        var lastLocationContent: String? = null,
+) : RealmObject() {
+    companion object
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt
index a33ba82f7a..9350102137 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt
@@ -56,18 +56,21 @@ internal fun ChunkEntity.Companion.findLastForwardChunkOfRoom(realm: Realm, room
             .equalTo(ChunkEntityFields.IS_LAST_FORWARD, true)
             .findFirst()
 }
+
 internal fun ChunkEntity.Companion.findLastForwardChunkOfThread(realm: Realm, roomId: String, rootThreadEventId: String): ChunkEntity? {
     return where(realm, roomId)
             .equalTo(ChunkEntityFields.ROOT_THREAD_EVENT_ID, rootThreadEventId)
             .equalTo(ChunkEntityFields.IS_LAST_FORWARD_THREAD, true)
             .findFirst()
 }
+
 internal fun ChunkEntity.Companion.findEventInThreadChunk(realm: Realm, roomId: String, event: String): ChunkEntity? {
     return where(realm, roomId)
             .`in`(ChunkEntityFields.TIMELINE_EVENTS.EVENT_ID, arrayListOf(event).toTypedArray())
             .equalTo(ChunkEntityFields.IS_LAST_FORWARD_THREAD, true)
             .findFirst()
 }
+
 internal fun ChunkEntity.Companion.findAllIncludingEvents(realm: Realm, eventIds: List<String>): RealmResults<ChunkEntity> {
     return realm.where<ChunkEntity>()
             .`in`(ChunkEntityFields.TIMELINE_EVENTS.EVENT_ID, eventIds.toTypedArray())
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/LiveLocationShareAggregatedSummaryEntityQuery.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/LiveLocationShareAggregatedSummaryEntityQuery.kt
new file mode 100644
index 0000000000..2e2e939fa2
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/LiveLocationShareAggregatedSummaryEntityQuery.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.query
+
+import io.realm.Realm
+import io.realm.RealmQuery
+import io.realm.kotlin.where
+import org.matrix.android.sdk.internal.database.model.EventAnnotationsSummaryEntity
+import org.matrix.android.sdk.internal.database.model.livelocation.LiveLocationShareAggregatedSummaryEntity
+import org.matrix.android.sdk.internal.database.model.livelocation.LiveLocationShareAggregatedSummaryEntityFields
+
+internal fun LiveLocationShareAggregatedSummaryEntity.Companion.where(
+        realm: Realm,
+        roomId: String,
+        eventId: String,
+): RealmQuery<LiveLocationShareAggregatedSummaryEntity> {
+    return realm.where<LiveLocationShareAggregatedSummaryEntity>()
+            .equalTo(LiveLocationShareAggregatedSummaryEntityFields.ROOM_ID, roomId)
+            .equalTo(LiveLocationShareAggregatedSummaryEntityFields.EVENT_ID, eventId)
+}
+
+internal fun LiveLocationShareAggregatedSummaryEntity.Companion.create(
+        realm: Realm,
+        roomId: String,
+        eventId: String,
+): LiveLocationShareAggregatedSummaryEntity {
+    val obj = realm.createObject(LiveLocationShareAggregatedSummaryEntity::class.java, eventId).apply {
+        this.roomId = roomId
+    }
+    val annotationSummary = EventAnnotationsSummaryEntity.getOrCreate(realm, roomId = roomId, eventId = eventId)
+    annotationSummary.liveLocationShareAggregatedSummary = obj
+
+    return obj
+}
+
+internal fun LiveLocationShareAggregatedSummaryEntity.Companion.getOrCreate(
+        realm: Realm,
+        roomId: String,
+        eventId: String,
+): LiveLocationShareAggregatedSummaryEntity {
+    return LiveLocationShareAggregatedSummaryEntity.where(realm, roomId, eventId).findFirst()
+            ?: LiveLocationShareAggregatedSummaryEntity.create(realm, roomId, eventId)
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt
index 1f6b210252..3cea19a690 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt
@@ -18,7 +18,7 @@ package org.matrix.android.sdk.internal.database.query
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.kotlin.where
-import org.matrix.android.sdk.api.pushrules.RuleKind
+import org.matrix.android.sdk.api.session.pushrules.RuleKind
 import org.matrix.android.sdk.internal.database.model.PushRuleEntity
 import org.matrix.android.sdk.internal.database.model.PushRuleEntityFields
 import org.matrix.android.sdk.internal.database.model.PushRulesEntity
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ThreadSummaryEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ThreadSummaryEntityQueries.kt
index 517d43d7cf..eab2740433 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ThreadSummaryEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ThreadSummaryEntityQueries.kt
@@ -39,9 +39,11 @@ internal fun ThreadSummaryEntity.Companion.getOrCreate(realm: Realm, roomId: Str
         this.rootThreadEventId = rootThreadEventId
     }
 }
+
 internal fun ThreadSummaryEntity.Companion.getOrNull(realm: Realm, roomId: String, rootThreadEventId: String): ThreadSummaryEntity? {
     return where(realm, roomId, rootThreadEventId).findFirst()
 }
+
 internal fun RealmList<ThreadSummaryEntity>.find(rootThreadEventId: String): ThreadSummaryEntity? {
     return this.where()
             .equalTo(ThreadSummaryEntityFields.ROOT_THREAD_EVENT_ID, rootThreadEventId)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt
index 81d5ac835f..215ab34f95 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt
@@ -29,26 +29,35 @@ import org.matrix.android.sdk.internal.database.model.RoomEntity
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
 
-internal fun TimelineEventEntity.Companion.where(realm: Realm, roomId: String, eventId: String): RealmQuery<TimelineEventEntity> {
-    return realm.where<TimelineEventEntity>()
+internal fun TimelineEventEntity.Companion.where(realm: Realm): RealmQuery<TimelineEventEntity> {
+    return realm.where()
+}
+
+internal fun TimelineEventEntity.Companion.where(realm: Realm,
+                                                 roomId: String,
+                                                 eventId: String): RealmQuery<TimelineEventEntity> {
+    return where(realm)
             .equalTo(TimelineEventEntityFields.ROOM_ID, roomId)
             .equalTo(TimelineEventEntityFields.EVENT_ID, eventId)
 }
 
-internal fun TimelineEventEntity.Companion.where(realm: Realm, roomId: String, eventIds: List<String>): RealmQuery<TimelineEventEntity> {
-    return realm.where<TimelineEventEntity>()
+internal fun TimelineEventEntity.Companion.where(realm: Realm,
+                                                 roomId: String,
+                                                 eventIds: List<String>): RealmQuery<TimelineEventEntity> {
+    return where(realm)
             .equalTo(TimelineEventEntityFields.ROOM_ID, roomId)
             .`in`(TimelineEventEntityFields.EVENT_ID, eventIds.toTypedArray())
 }
 
 internal fun TimelineEventEntity.Companion.whereRoomId(realm: Realm,
                                                        roomId: String): RealmQuery<TimelineEventEntity> {
-    return realm.where<TimelineEventEntity>()
+    return where(realm)
             .equalTo(TimelineEventEntityFields.ROOM_ID, roomId)
 }
 
-internal fun TimelineEventEntity.Companion.findWithSenderMembershipEvent(realm: Realm, senderMembershipEventId: String): List<TimelineEventEntity> {
-    return realm.where<TimelineEventEntity>()
+internal fun TimelineEventEntity.Companion.findWithSenderMembershipEvent(realm: Realm,
+                                                                         senderMembershipEventId: String): List<TimelineEventEntity> {
+    return where(realm)
             .equalTo(TimelineEventEntityFields.SENDER_MEMBERSHIP_EVENT_ID, senderMembershipEventId)
             .findAll()
 }
@@ -110,12 +119,12 @@ internal fun RealmQuery<TimelineEventEntity>.filterTypes(filterTypes: List<Strin
     return if (filterTypes.isEmpty()) {
         this
     } else {
-        this.`in`(TimelineEventEntityFields.ROOT.TYPE, filterTypes.toTypedArray())
+        `in`(TimelineEventEntityFields.ROOT.TYPE, filterTypes.toTypedArray())
     }
 }
 
 internal fun RealmList<TimelineEventEntity>.find(eventId: String): TimelineEventEntity? {
-    return this.where()
+    return where()
             .equalTo(TimelineEventEntityFields.EVENT_ID, eventId)
             .findFirst()
 }
@@ -132,3 +141,14 @@ internal fun RealmQuery<TimelineEventEntity>.filterSendStates(sendStates: List<S
     val sendStatesStr = sendStates.map { it.name }.toTypedArray()
     return `in`(TimelineEventEntityFields.ROOT.SEND_STATE_STR, sendStatesStr)
 }
+
+/**
+ * Find all TimelineEventEntity items where sender is in senderIds collection, excluding state events
+ */
+internal fun TimelineEventEntity.Companion.findAllFrom(realm: Realm,
+                                                       senderIds: Collection<String>): RealmResults<TimelineEventEntity> {
+    return where(realm)
+            .`in`(TimelineEventEntityFields.ROOT.SENDER, senderIds.toTypedArray())
+            .isNull(TimelineEventEntityFields.ROOT.STATE_KEY)
+            .findAll()
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt
index 2fad2d8e78..dbc6aac6b5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt
@@ -43,15 +43,17 @@ import org.matrix.android.sdk.internal.worker.MatrixWorkerFactory
 import org.matrix.olm.OlmManager
 import java.io.File
 
-@Component(modules = [
-    MatrixModule::class,
-    NetworkModule::class,
-    AuthModule::class,
-    RawModule::class,
-    SettingsModule::class,
-    SystemModule::class,
-    NoOpTestModule::class
-])
+@Component(
+        modules = [
+            MatrixModule::class,
+            NetworkModule::class,
+            AuthModule::class,
+            RawModule::class,
+            SettingsModule::class,
+            SystemModule::class,
+            NoOpTestModule::class
+        ]
+)
 @MatrixScope
 internal interface MatrixComponent {
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt
index 9cab307c61..49713a1d7f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt
@@ -36,7 +36,8 @@ internal object MatrixModule {
     @Provides
     @MatrixScope
     fun providesMatrixCoroutineDispatchers(): MatrixCoroutineDispatchers {
-        return MatrixCoroutineDispatchers(io = Dispatchers.IO,
+        return MatrixCoroutineDispatchers(
+                io = Dispatchers.IO,
                 computation = Dispatchers.Default,
                 main = Dispatchers.Main,
                 crypto = createBackgroundHandler("Crypto_Thread").asCoroutineDispatcher(),
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
index 10b0d4fb13..8f007f227c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
@@ -46,17 +46,18 @@ internal object MoshiProvider {
             .add(TlsVersionMoshiAdapter())
             // Use addLast here so we can inject a SplitLazyRoomSyncJsonAdapter later to override the default parsing.
             .addLast(DefaultLazyRoomSyncEphemeralJsonAdapter())
-            .add(RuntimeJsonAdapterFactory.of(MessageContent::class.java, "msgtype", MessageDefaultContent::class.java)
-                    .registerSubtype(MessageTextContent::class.java, MessageType.MSGTYPE_TEXT)
-                    .registerSubtype(MessageNoticeContent::class.java, MessageType.MSGTYPE_NOTICE)
-                    .registerSubtype(MessageEmoteContent::class.java, MessageType.MSGTYPE_EMOTE)
-                    .registerSubtype(MessageAudioContent::class.java, MessageType.MSGTYPE_AUDIO)
-                    .registerSubtype(MessageImageContent::class.java, MessageType.MSGTYPE_IMAGE)
-                    .registerSubtype(MessageVideoContent::class.java, MessageType.MSGTYPE_VIDEO)
-                    .registerSubtype(MessageLocationContent::class.java, MessageType.MSGTYPE_LOCATION)
-                    .registerSubtype(MessageFileContent::class.java, MessageType.MSGTYPE_FILE)
-                    .registerSubtype(MessageVerificationRequestContent::class.java, MessageType.MSGTYPE_VERIFICATION_REQUEST)
-                    .registerSubtype(MessagePollResponseContent::class.java, MessageType.MSGTYPE_POLL_RESPONSE)
+            .add(
+                    RuntimeJsonAdapterFactory.of(MessageContent::class.java, "msgtype", MessageDefaultContent::class.java)
+                            .registerSubtype(MessageTextContent::class.java, MessageType.MSGTYPE_TEXT)
+                            .registerSubtype(MessageNoticeContent::class.java, MessageType.MSGTYPE_NOTICE)
+                            .registerSubtype(MessageEmoteContent::class.java, MessageType.MSGTYPE_EMOTE)
+                            .registerSubtype(MessageAudioContent::class.java, MessageType.MSGTYPE_AUDIO)
+                            .registerSubtype(MessageImageContent::class.java, MessageType.MSGTYPE_IMAGE)
+                            .registerSubtype(MessageVideoContent::class.java, MessageType.MSGTYPE_VIDEO)
+                            .registerSubtype(MessageLocationContent::class.java, MessageType.MSGTYPE_LOCATION)
+                            .registerSubtype(MessageFileContent::class.java, MessageType.MSGTYPE_FILE)
+                            .registerSubtype(MessageVerificationRequestContent::class.java, MessageType.MSGTYPE_VERIFICATION_REQUEST)
+                            .registerSubtype(MessagePollResponseContent::class.java, MessageType.MSGTYPE_POLL_RESPONSE)
             )
             .add(SerializeNulls.JSON_ADAPTER_FACTORY)
             .build()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt
index fedd7d05f9..60760be29f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt
@@ -84,9 +84,11 @@ internal class WorkManagerProvider @Inject constructor(
                     if (workInfo?.state?.isFinished == true) {
                         checkWorkerLiveState.removeObserver(this)
                         if (workInfo.state == WorkInfo.State.FAILED) {
-                            throw RuntimeException("MatrixWorkerFactory is not being set on your worker configuration.\n" +
-                                    "Makes sure to add it to a DelegatingWorkerFactory if you have your own factory or use it directly.\n" +
-                                    "You can grab the instance through the Matrix class.")
+                            throw RuntimeException(
+                                    "MatrixWorkerFactory is not being set on your worker configuration.\n" +
+                                            "Makes sure to add it to a DelegatingWorkerFactory if you have your own factory or use it directly.\n" +
+                                            "You can grab the instance through the Matrix class."
+                            )
                         }
                     }
                 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnown.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnown.kt
index 3b4bd1b1a3..087f99ba7e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnown.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnown.kt
@@ -76,10 +76,12 @@ class WellKnown {
                         if (apiUrl != null &&
                                 apiUrl.startsWith("https://") &&
                                 uiUrl!!.startsWith("https://")) {
-                            managers.add(WellKnownManagerConfig(
-                                    apiUrl = apiUrl,
-                                    uiUrl = uiUrl
-                            ))
+                            managers.add(
+                                    WellKnownManagerConfig(
+                                            apiUrl = apiUrl,
+                                            uiUrl = uiUrl
+                                    )
+                            )
                         }
                     }
                 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConnectivityChecker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConnectivityChecker.kt
index cd7c99b8f9..3d2b2bfbfb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConnectivityChecker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConnectivityChecker.kt
@@ -44,7 +44,7 @@ internal interface NetworkConnectivityChecker {
 internal class DefaultNetworkConnectivityChecker @Inject constructor(private val homeServerPinger: HomeServerPinger,
                                                                      private val backgroundDetectionObserver: BackgroundDetectionObserver,
                                                                      private val networkCallbackStrategy: NetworkCallbackStrategy) :
-    NetworkConnectivityChecker {
+        NetworkConnectivityChecker {
 
     private val hasInternetAccess = AtomicBoolean(true)
     private val listeners = Collections.synchronizedSet(LinkedHashSet<NetworkConnectivityChecker.Listener>())
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RequestExecutor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RequestExecutor.kt
index 5cd2d88000..71df7c08be 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RequestExecutor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RequestExecutor.kt
@@ -15,6 +15,7 @@
  */
 
 package org.matrix.android.sdk.internal.network
+
 import org.matrix.android.sdk.internal.network.executeRequest as internalExecuteRequest
 
 internal interface RequestExecutor {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/RuntimeJsonAdapterFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/RuntimeJsonAdapterFactory.kt
index 0aaa4991cd..40d174ee2d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/RuntimeJsonAdapterFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/RuntimeJsonAdapterFactory.kt
@@ -63,8 +63,10 @@ internal class RuntimeJsonAdapterFactory<T>(
         }
         val fallbackAdapter = moshi.adapter<Any>(fallbackType)
         val objectJsonAdapter = moshi.adapter(Any::class.java)
-        return RuntimeJsonAdapter(labelKey, labelToAdapter, typeToLabel,
-                objectJsonAdapter, fallbackAdapter).nullSafe()
+        return RuntimeJsonAdapter(
+                labelKey, labelToAdapter, typeToLabel,
+                objectJsonAdapter, fallbackAdapter
+        ).nullSafe()
     }
 
     @Suppress("UNCHECKED_CAST")
@@ -77,8 +79,10 @@ internal class RuntimeJsonAdapterFactory<T>(
         override fun fromJson(reader: JsonReader): Any? {
             val peekedToken = reader.peek()
             if (peekedToken != JsonReader.Token.BEGIN_OBJECT) {
-                throw JsonDataException("Expected BEGIN_OBJECT but was " + peekedToken +
-                        " at path " + reader.path)
+                throw JsonDataException(
+                        "Expected BEGIN_OBJECT but was " + peekedToken +
+                                " at path " + reader.path
+                )
             }
             val jsonValue = reader.readJsonValue()
             val jsonObject = jsonValue as Map<String, Any>?
@@ -91,13 +95,15 @@ internal class RuntimeJsonAdapterFactory<T>(
         override fun toJson(writer: JsonWriter, value: Any?) {
             val type: Class<*> = value!!.javaClass
             val label = typeToLabel[type]
-                    ?: throw IllegalArgumentException("Expected one of " +
-                            typeToLabel.keys +
-                            " but found " +
-                            value +
-                            ", a " +
-                            value.javaClass +
-                            ". Register this subtype.")
+                    ?: throw IllegalArgumentException(
+                            "Expected one of " +
+                                    typeToLabel.keys +
+                                    " but found " +
+                                    value +
+                                    ", a " +
+                                    value.javaClass +
+                                    ". Register this subtype."
+                    )
             val adapter = labelToAdapter[label]!!
             val jsonValue = adapter.toJsonValue(value) as Map<String, Any>?
             val valueWithLabel: MutableMap<String, Any> = LinkedHashMap(1 + jsonValue!!.size)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryRoomOrderProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryRoomOrderProcessor.kt
index 7294ce4abf..c5ea2d48ad 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryRoomOrderProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryRoomOrderProcessor.kt
@@ -35,8 +35,10 @@ internal fun RealmQuery<RoomSummaryEntity>.process(sortOrder: RoomSortOrder): Re
                     arrayOf(
                             RoomSummaryEntityFields.IS_FAVOURITE,
                             RoomSummaryEntityFields.IS_LOW_PRIORITY,
-                            RoomSummaryEntityFields.LAST_ACTIVITY_TIME),
-                    arrayOf(Sort.DESCENDING, Sort.ASCENDING, Sort.DESCENDING))
+                            RoomSummaryEntityFields.LAST_ACTIVITY_TIME
+                    ),
+                    arrayOf(Sort.DESCENDING, Sort.ASCENDING, Sort.DESCENDING)
+            )
         }
         RoomSortOrder.NONE                  -> {
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmModule.kt
index 770a49c904..c95e4316e2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmModule.kt
@@ -23,9 +23,11 @@ import org.matrix.android.sdk.internal.database.model.RawCacheEntity
 /**
  * Realm module for global classes
  */
-@RealmModule(library = true,
+@RealmModule(
+        library = true,
         classes = [
             RawCacheEntity::class,
             KnownServerUrlEntity::class
-        ])
+        ]
+)
 internal class GlobalRealmModule
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
index ac097f57ee..78f1c84f3d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
@@ -38,6 +38,7 @@ import org.matrix.android.sdk.internal.di.SessionDownloadsDirectory
 import org.matrix.android.sdk.internal.di.UnauthenticatedWithCertificateWithProgress
 import org.matrix.android.sdk.internal.session.download.DownloadProgressInterceptor.Companion.DOWNLOAD_PROGRESS_INTERCEPTOR_HEADER
 import org.matrix.android.sdk.internal.util.file.AtomicFileCreator
+import org.matrix.android.sdk.internal.util.time.Clock
 import org.matrix.android.sdk.internal.util.writeToFile
 import timber.log.Timber
 import java.io.File
@@ -51,7 +52,8 @@ internal class DefaultFileService @Inject constructor(
         private val contentUrlResolver: ContentUrlResolver,
         @UnauthenticatedWithCertificateWithProgress
         private val okHttpClient: OkHttpClient,
-        private val coroutineDispatchers: MatrixCoroutineDispatchers
+        private val coroutineDispatchers: MatrixCoroutineDispatchers,
+        private val clock: Clock,
 ) : FileService {
 
     // Legacy folder, will be deleted
@@ -123,7 +125,7 @@ internal class DefaultFileService @Inject constructor(
                     val resolvedUrl = contentUrlResolver.resolveForDownload(url, elementToDecrypt) ?: throw IllegalArgumentException("url is null")
 
                     val request = when (resolvedUrl) {
-                        is ContentUrlResolver.ResolvedMethod.GET -> {
+                        is ContentUrlResolver.ResolvedMethod.GET  -> {
                             Request.Builder()
                                     .url(resolvedUrl.url)
                                     .header(DOWNLOAD_PROGRESS_INTERCEPTOR_HEADER, url)
@@ -182,7 +184,8 @@ internal class DefaultFileService @Inject constructor(
                             MXEncryptedAttachments.decryptAttachment(
                                     inputStream,
                                     elementToDecrypt,
-                                    outputStream
+                                    outputStream,
+                                    clock
                             )
                         }
                     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
index 1e533158a7..5f77cfb23a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
@@ -26,7 +26,6 @@ import org.matrix.android.sdk.api.MatrixCoroutineDispatchers
 import org.matrix.android.sdk.api.auth.data.SessionParams
 import org.matrix.android.sdk.api.failure.GlobalError
 import org.matrix.android.sdk.api.federation.FederationService
-import org.matrix.android.sdk.api.pushrules.PushRuleService
 import org.matrix.android.sdk.api.session.EventStreamService
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.SessionLifecycleObserver
@@ -53,6 +52,7 @@ import org.matrix.android.sdk.api.session.permalinks.PermalinkService
 import org.matrix.android.sdk.api.session.presence.PresenceService
 import org.matrix.android.sdk.api.session.profile.ProfileService
 import org.matrix.android.sdk.api.session.pushers.PushersService
+import org.matrix.android.sdk.api.session.pushrules.PushRuleService
 import org.matrix.android.sdk.api.session.room.RoomDirectoryService
 import org.matrix.android.sdk.api.session.room.RoomService
 import org.matrix.android.sdk.api.session.search.SearchService
@@ -124,12 +124,12 @@ internal class DefaultSession @Inject constructor(
         private val syncStatusService: Lazy<SyncStatusService>,
         private val homeServerCapabilitiesService: Lazy<HomeServerCapabilitiesService>,
         private val accountDataService: Lazy<SessionAccountDataService>,
-        private val _sharedSecretStorageService: Lazy<SharedSecretStorageService>,
+        private val sharedSecretStorageService: Lazy<SharedSecretStorageService>,
         private val accountService: Lazy<AccountService>,
         private val eventService: Lazy<EventService>,
         private val contentScannerService: Lazy<ContentScannerService>,
-        private val identityService: IdentityService,
-        private val integrationManagerService: IntegrationManagerService,
+        private val identityService: Lazy<IdentityService>,
+        private val integrationManagerService: Lazy<IntegrationManagerService>,
         private val thirdPartyService: Lazy<ThirdPartyService>,
         private val callSignalingService: Lazy<CallSignalingService>,
         private val spaceService: Lazy<SpaceService>,
@@ -140,28 +140,7 @@ internal class DefaultSession @Inject constructor(
         @UnauthenticatedWithCertificate
         private val unauthenticatedWithCertificateOkHttpClient: Lazy<OkHttpClient>
 ) : Session,
-        GlobalErrorHandler.Listener,
-        RoomService by roomService.get(),
-        RoomDirectoryService by roomDirectoryService.get(),
-        GroupService by groupService.get(),
-        UserService by userService.get(),
-        SignOutService by signOutService.get(),
-        FilterService by filterService.get(),
-        PushRuleService by pushRuleService.get(),
-        PushersService by pushersService.get(),
-        EventService by eventService.get(),
-        TermsService by termsService.get(),
-        SyncStatusService by syncStatusService.get(),
-        SecureStorageService by secureStorageService.get(),
-        HomeServerCapabilitiesService by homeServerCapabilitiesService.get(),
-        ProfileService by profileService.get(),
-        PresenceService by presenceService.get(),
-        AccountService by accountService.get(),
-        ToDeviceService by toDeviceService.get(),
-        EventStreamService by eventStreamService.get() {
-
-    override val sharedSecretStorageService: SharedSecretStorageService
-        get() = _sharedSecretStorageService.get()
+        GlobalErrorHandler.Listener {
 
     private var isOpen = false
 
@@ -274,42 +253,44 @@ internal class DefaultSession @Inject constructor(
     }
 
     override fun contentUrlResolver() = contentUrlResolver
-
     override fun contentUploadProgressTracker() = contentUploadProgressTracker
-
     override fun typingUsersTracker() = typingUsersTracker
-
     override fun contentDownloadProgressTracker(): ContentDownloadStateTracker = contentDownloadStateTracker
 
     override fun cryptoService(): CryptoService = cryptoService.get()
-
     override fun contentScannerService(): ContentScannerService = contentScannerService.get()
-
-    override fun identityService() = identityService
-
+    override fun identityService(): IdentityService = identityService.get()
+    override fun homeServerCapabilitiesService(): HomeServerCapabilitiesService = homeServerCapabilitiesService.get()
+    override fun roomService(): RoomService = roomService.get()
+    override fun roomDirectoryService(): RoomDirectoryService = roomDirectoryService.get()
+    override fun groupService(): GroupService = groupService.get()
+    override fun userService(): UserService = userService.get()
+    override fun signOutService(): SignOutService = signOutService.get()
+    override fun filterService(): FilterService = filterService.get()
+    override fun pushRuleService(): PushRuleService = pushRuleService.get()
+    override fun pushersService(): PushersService = pushersService.get()
+    override fun eventService(): EventService = eventService.get()
+    override fun termsService(): TermsService = termsService.get()
+    override fun syncStatusService(): SyncStatusService = syncStatusService.get()
+    override fun secureStorageService(): SecureStorageService = secureStorageService.get()
+    override fun profileService(): ProfileService = profileService.get()
+    override fun presenceService(): PresenceService = presenceService.get()
+    override fun accountService(): AccountService = accountService.get()
+    override fun toDeviceService(): ToDeviceService = toDeviceService.get()
+    override fun eventStreamService(): EventStreamService = eventStreamService.get()
     override fun fileService(): FileService = defaultFileService.get()
-
     override fun permalinkService(): PermalinkService = permalinkService.get()
-
     override fun widgetService(): WidgetService = widgetService.get()
-
     override fun mediaService(): MediaService = mediaService.get()
-
-    override fun integrationManagerService() = integrationManagerService
-
+    override fun integrationManagerService(): IntegrationManagerService = integrationManagerService.get()
     override fun callSignalingService(): CallSignalingService = callSignalingService.get()
-
     override fun searchService(): SearchService = searchService.get()
-
     override fun federationService(): FederationService = federationService.get()
-
     override fun thirdPartyService(): ThirdPartyService = thirdPartyService.get()
-
     override fun spaceService(): SpaceService = spaceService.get()
-
     override fun openIdService(): OpenIdService = openIdService.get()
-
     override fun accountDataService(): SessionAccountDataService = accountDataService.get()
+    override fun sharedSecretStorageService(): SharedSecretStorageService = sharedSecretStorageService.get()
 
     override fun getOkHttpClient(): OkHttpClient {
         return unauthenticatedWithCertificateOkHttpClient.get()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
index 76e5d84e56..fb9b2da6c1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
@@ -68,7 +68,8 @@ import org.matrix.android.sdk.internal.session.widgets.WidgetModule
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.util.system.SystemModule
 
-@Component(dependencies = [MatrixComponent::class],
+@Component(
+        dependencies = [MatrixComponent::class],
         modules = [
             SessionModule::class,
             RoomModule::class,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt
index 752856b931..9f3f1f649e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt
@@ -18,6 +18,8 @@ package org.matrix.android.sdk.internal.session.account
 
 import org.matrix.android.sdk.api.auth.UIABaseAuth
 import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
+import org.matrix.android.sdk.api.session.uia.UiaResult
+import org.matrix.android.sdk.api.session.uia.exceptions.UiaCancelledException
 import org.matrix.android.sdk.internal.auth.registration.handleUIA
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
@@ -51,18 +53,24 @@ internal class DefaultDeactivateAccountTask @Inject constructor(
             }
             true
         } catch (throwable: Throwable) {
-            if (!handleUIA(
-                            failure = throwable,
-                            interceptor = params.userInteractiveAuthInterceptor,
-                            retryBlock = { authUpdate ->
-                                execute(params.copy(userAuthParam = authUpdate))
-                            }
-                    )
-            ) {
-                Timber.d("## UIA: propagate failure")
-                throw throwable
-            } else {
-                false
+            when (handleUIA(
+                    failure = throwable,
+                    interceptor = params.userInteractiveAuthInterceptor,
+                    retryBlock = { authUpdate ->
+                        execute(params.copy(userAuthParam = authUpdate))
+                    }
+            )) {
+                UiaResult.SUCCESS   -> {
+                    false
+                }
+                UiaResult.FAILURE   -> {
+                    Timber.d("## UIA: propagate failure")
+                    throw throwable
+                }
+                UiaResult.CANCELLED -> {
+                    Timber.d("## UIA: cancelled")
+                    throw UiaCancelledException()
+                }
             }
         }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt
index 3f199c5cce..b15a647421 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt
@@ -30,7 +30,7 @@ private val loggerTag = LoggerTag("CallEventProcessor", LoggerTag.VOIP)
 
 @SessionScope
 internal class CallEventProcessor @Inject constructor(private val callSignalingHandler: CallSignalingHandler) :
-    EventInsertLiveProcessor {
+        EventInsertLiveProcessor {
 
     private val allowedTypes = listOf(
             EventType.CALL_ANSWER,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallSignalingHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallSignalingHandler.kt
index 59058bf976..c4f711a9e6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallSignalingHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallSignalingHandler.kt
@@ -34,6 +34,7 @@ import org.matrix.android.sdk.api.session.room.model.call.CallSelectAnswerConten
 import org.matrix.android.sdk.api.session.room.model.call.CallSignalingContent
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -41,9 +42,12 @@ private val loggerTag = LoggerTag("CallSignalingHandler", LoggerTag.VOIP)
 private const val MAX_AGE_TO_RING = 40_000
 
 @SessionScope
-internal class CallSignalingHandler @Inject constructor(private val activeCallHandler: ActiveCallHandler,
-                                                        private val mxCallFactory: MxCallFactory,
-                                                        @UserId private val userId: String) {
+internal class CallSignalingHandler @Inject constructor(
+        private val activeCallHandler: ActiveCallHandler,
+        private val mxCallFactory: MxCallFactory,
+        @UserId private val userId: String,
+        private val clock: Clock,
+) {
 
     private val invitedCallIds = mutableSetOf<String>()
     private val callListeners = mutableSetOf<CallListener>()
@@ -184,7 +188,7 @@ internal class CallSignalingHandler @Inject constructor(private val activeCallHa
         if (event.roomId == null || event.senderId == null) {
             return
         }
-        val now = System.currentTimeMillis()
+        val now = clock.epochMillis()
         val age = now - (event.ageLocalTs ?: now)
         if (age > MAX_AGE_TO_RING) {
             Timber.tag(loggerTag.value).w("Call invite is too old to ring.")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/MxCallFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/MxCallFactory.kt
index 547be2253f..9ec892b65d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/MxCallFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/MxCallFactory.kt
@@ -28,6 +28,7 @@ import org.matrix.android.sdk.internal.session.call.model.MxCallImpl
 import org.matrix.android.sdk.internal.session.profile.GetProfileInfoTask
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory
 import org.matrix.android.sdk.internal.session.room.send.queue.EventSenderProcessor
+import org.matrix.android.sdk.internal.util.time.Clock
 import javax.inject.Inject
 
 internal class MxCallFactory @Inject constructor(
@@ -36,7 +37,8 @@ internal class MxCallFactory @Inject constructor(
         private val eventSenderProcessor: EventSenderProcessor,
         private val matrixConfiguration: MatrixConfiguration,
         private val getProfileInfoTask: GetProfileInfoTask,
-        @UserId private val userId: String
+        @UserId private val userId: String,
+        private val clock: Clock,
 ) {
 
     fun createIncomingCall(roomId: String, opponentUserId: String, content: CallInviteContent): MxCall? {
@@ -51,7 +53,8 @@ internal class MxCallFactory @Inject constructor(
                 localEchoEventFactory = localEchoEventFactory,
                 eventSenderProcessor = eventSenderProcessor,
                 matrixConfiguration = matrixConfiguration,
-                getProfileInfoTask = getProfileInfoTask
+                getProfileInfoTask = getProfileInfoTask,
+                clock = clock,
         ).apply {
             updateOpponentData(opponentUserId, content, content.capabilities)
         }
@@ -68,7 +71,8 @@ internal class MxCallFactory @Inject constructor(
                 localEchoEventFactory = localEchoEventFactory,
                 eventSenderProcessor = eventSenderProcessor,
                 matrixConfiguration = matrixConfiguration,
-                getProfileInfoTask = getProfileInfoTask
+                getProfileInfoTask = getProfileInfoTask,
+                clock = clock,
         ).apply {
             // Setup with this userId, might be updated when processing the Answer event
             this.opponentUserId = opponentUserId
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt
index a89713870a..796e83311f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt
@@ -46,6 +46,7 @@ import org.matrix.android.sdk.internal.session.call.DefaultCallSignalingService
 import org.matrix.android.sdk.internal.session.profile.GetProfileInfoTask
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory
 import org.matrix.android.sdk.internal.session.room.send.queue.EventSenderProcessor
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 import java.math.BigDecimal
 
@@ -61,7 +62,8 @@ internal class MxCallImpl(
         private val localEchoEventFactory: LocalEchoEventFactory,
         private val eventSenderProcessor: EventSenderProcessor,
         private val matrixConfiguration: MatrixConfiguration,
-        private val getProfileInfoTask: GetProfileInfoTask
+        private val getProfileInfoTask: GetProfileInfoTask,
+        private val clock: Clock,
 ) : MxCall {
 
     override var opponentPartyId: Optional<String>? = null
@@ -250,7 +252,7 @@ internal class MxCallImpl(
     private fun createEventAndLocalEcho(localId: String = LocalEcho.createLocalEchoId(), type: String, roomId: String, content: Content): Event {
         return Event(
                 roomId = roomId,
-                originServerTs = System.currentTimeMillis(),
+                originServerTs = clock.epochMillis(),
                 senderId = userId,
                 eventId = localId,
                 type = type,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
index e9cb423893..f96a019fe2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
@@ -148,8 +148,8 @@ internal class FileUploader @Inject constructor(
                 .post(requestBody)
                 .build()
 
-       return withContext(coroutineDispatchers.io) {
-             okHttpClient.newCall(request).awaitResponse().use { response ->
+        return withContext(coroutineDispatchers.io) {
+            okHttpClient.newCall(request).awaitResponse().use { response ->
                 if (!response.isSuccessful) {
                     throw response.toFailure(globalErrorReceiver)
                 } else {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt
index 01eb52ff22..c5aa6cd5e7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt
@@ -68,16 +68,16 @@ internal class ImageCompressor @Inject constructor(
                     val orientation = exifInfo.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL)
                     val matrix = Matrix()
                     when (orientation) {
-                        ExifInterface.ORIENTATION_ROTATE_270 -> matrix.postRotate(270f)
-                        ExifInterface.ORIENTATION_ROTATE_180 -> matrix.postRotate(180f)
-                        ExifInterface.ORIENTATION_ROTATE_90 -> matrix.postRotate(90f)
+                        ExifInterface.ORIENTATION_ROTATE_270      -> matrix.postRotate(270f)
+                        ExifInterface.ORIENTATION_ROTATE_180      -> matrix.postRotate(180f)
+                        ExifInterface.ORIENTATION_ROTATE_90       -> matrix.postRotate(90f)
                         ExifInterface.ORIENTATION_FLIP_HORIZONTAL -> matrix.preScale(-1f, 1f)
-                        ExifInterface.ORIENTATION_FLIP_VERTICAL -> matrix.preScale(1f, -1f)
-                        ExifInterface.ORIENTATION_TRANSPOSE -> {
+                        ExifInterface.ORIENTATION_FLIP_VERTICAL   -> matrix.preScale(1f, -1f)
+                        ExifInterface.ORIENTATION_TRANSPOSE       -> {
                             matrix.preRotate(-90f)
                             matrix.preScale(-1f, 1f)
                         }
-                        ExifInterface.ORIENTATION_TRANSVERSE -> {
+                        ExifInterface.ORIENTATION_TRANSVERSE      -> {
                             matrix.preRotate(90f)
                             matrix.preScale(-1f, 1f)
                         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index 75606f2e7a..d3de807b23 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -46,6 +46,7 @@ import org.matrix.android.sdk.internal.session.room.send.LocalEchoIdentifiers
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoRepository
 import org.matrix.android.sdk.internal.session.room.send.MultipleEventSendingDispatcherWorker
 import org.matrix.android.sdk.internal.util.TemporaryFileCreator
+import org.matrix.android.sdk.internal.util.time.Clock
 import org.matrix.android.sdk.internal.util.toMatrixErrorStr
 import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker
 import org.matrix.android.sdk.internal.worker.SessionWorkerParams
@@ -87,6 +88,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
     @Inject lateinit var thumbnailExtractor: ThumbnailExtractor
     @Inject lateinit var localEchoRepository: LocalEchoRepository
     @Inject lateinit var temporaryFileCreator: TemporaryFileCreator
+    @Inject lateinit var clock: Clock
 
     override fun injectWith(injector: SessionComponent) {
         injector.inject(this)
@@ -243,7 +245,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                             .also { filesToDelete.add(it) }
 
                     uploadedFileEncryptedFileInfo =
-                            MXEncryptedAttachments.encrypt(fileToUpload.inputStream(), encryptedFile) { read, total ->
+                            MXEncryptedAttachments.encrypt(fileToUpload.inputStream(), encryptedFile, clock) { read, total ->
                                 notifyTracker(params) {
                                     contentUploadStateTracker.setEncrypting(it, read.toLong(), total.toLong())
                                 }
@@ -287,12 +289,14 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
 
                 val uploadThumbnailResult = dealWithThumbnail(params)
 
-                handleSuccess(params,
+                handleSuccess(
+                        params,
                         contentUploadResponse.contentUri,
                         uploadedFileEncryptedFileInfo,
                         uploadThumbnailResult?.uploadedThumbnailUrl,
                         uploadThumbnailResult?.uploadedThumbnailEncryptedFileInfo,
-                        newAttachmentAttributes)
+                        newAttachmentAttributes
+                )
             } catch (t: Throwable) {
                 Timber.e(t, "## ERROR ${t.localizedMessage}")
                 handleFailure(params, t)
@@ -329,7 +333,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                         if (params.isEncrypted) {
                             Timber.v("Encrypt thumbnail")
                             notifyTracker(params) { contentUploadStateTracker.setEncryptingThumbnail(it) }
-                            val encryptionResult = MXEncryptedAttachments.encryptAttachment(thumbnailData.bytes.inputStream())
+                            val encryptionResult = MXEncryptedAttachments.encryptAttachment(thumbnailData.bytes.inputStream(), clock)
                             val contentUploadResponse = fileUploader.uploadByteArray(
                                     byteArray = encryptionResult.encryptedByteArray,
                                     filename = null,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/DefaultContentScannerService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/DefaultContentScannerService.kt
index da7e2d102e..5aaf058757 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/DefaultContentScannerService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/DefaultContentScannerService.kt
@@ -33,6 +33,7 @@ import org.matrix.android.sdk.internal.session.contentscanner.tasks.GetServerPub
 import org.matrix.android.sdk.internal.session.contentscanner.tasks.ScanEncryptedTask
 import org.matrix.android.sdk.internal.session.contentscanner.tasks.ScanMediaTask
 import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -46,7 +47,8 @@ internal class DefaultContentScannerService @Inject constructor(
         private val getServerPublicKeyTask: GetServerPublicKeyTask,
         private val scanEncryptedTask: ScanEncryptedTask,
         private val scanMediaTask: ScanMediaTask,
-        private val taskExecutor: TaskExecutor
+        private val taskExecutor: TaskExecutor,
+        private val clock: Clock,
 ) : ContentScannerService {
 
     // Cache public key in memory
@@ -71,11 +73,13 @@ internal class DefaultContentScannerService @Inject constructor(
 
     override suspend fun getScanResultForAttachment(mxcUrl: String, fileInfo: ElementToDecrypt?): ScanStatusInfo {
         val result = if (fileInfo != null) {
-            scanEncryptedTask.execute(ScanEncryptedTask.Params(
-                    mxcUrl = mxcUrl,
-                    publicServerKey = getServerPublicKey(false),
-                    encryptedInfo = fileInfo
-            ))
+            scanEncryptedTask.execute(
+                    ScanEncryptedTask.Params(
+                            mxcUrl = mxcUrl,
+                            publicServerKey = getServerPublicKey(false),
+                            encryptedInfo = fileInfo
+                    )
+            )
         } else {
             scanMediaTask.execute(ScanMediaTask.Params(mxcUrl))
         }
@@ -83,7 +87,7 @@ internal class DefaultContentScannerService @Inject constructor(
         return ScanStatusInfo(
                 state = if (result.clean) ScanState.TRUSTED else ScanState.INFECTED,
                 humanReadableMessage = result.info,
-                scanDateTimestamp = System.currentTimeMillis()
+                scanDateTimestamp = clock.epochMillis()
         )
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerEntityQueries.kt
index b47be235c6..e4b64a1a0e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerEntityQueries.kt
@@ -31,11 +31,14 @@ internal fun ContentScanResultEntity.Companion.get(realm: Realm, attachmentUrl:
             .findFirst()
 }
 
-internal fun ContentScanResultEntity.Companion.getOrCreate(realm: Realm, attachmentUrl: String, contentScannerUrl: String?): ContentScanResultEntity {
+internal fun ContentScanResultEntity.Companion.getOrCreate(realm: Realm,
+                                                           attachmentUrl: String,
+                                                           contentScannerUrl: String?,
+                                                           currentTimeMillis: Long): ContentScanResultEntity {
     return ContentScanResultEntity.get(realm, attachmentUrl, contentScannerUrl)
             ?: realm.createObject<ContentScanResultEntity>().also {
                 it.mediaUrl = attachmentUrl
-                it.scanDateTimestamp = System.currentTimeMillis()
+                it.scanDateTimestamp = currentTimeMillis
                 it.scannerUrl = contentScannerUrl
             }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerRealmModule.kt
index bb53140ad9..85c1947a80 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/ContentScannerRealmModule.kt
@@ -21,9 +21,11 @@ import io.realm.annotations.RealmModule
 /**
  * Realm module for content scanner classes
  */
-@RealmModule(library = true,
+@RealmModule(
+        library = true,
         classes = [
             ContentScannerInfoEntity::class,
             ContentScanResultEntity::class
-        ])
+        ]
+)
 internal class ContentScannerRealmModule
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/RealmContentScannerStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/RealmContentScannerStore.kt
index 947a66c8b9..27729d38c7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/RealmContentScannerStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/contentscanner/db/RealmContentScannerStore.kt
@@ -32,12 +32,14 @@ import org.matrix.android.sdk.internal.di.ContentScannerDatabase
 import org.matrix.android.sdk.internal.session.SessionScope
 import org.matrix.android.sdk.internal.session.contentscanner.data.ContentScannerStore
 import org.matrix.android.sdk.internal.util.isValidUrl
+import org.matrix.android.sdk.internal.util.time.Clock
 import javax.inject.Inject
 
 @SessionScope
 internal class RealmContentScannerStore @Inject constructor(
         @ContentScannerDatabase
-        private val realmConfiguration: RealmConfiguration
+        private val realmConfiguration: RealmConfiguration,
+        private val clock: Clock,
 ) : ContentScannerStore {
 
     private val monarchy = Monarchy.Builder()
@@ -82,15 +84,15 @@ internal class RealmContentScannerStore @Inject constructor(
 
     override fun updateStateForContent(mxcUrl: String, state: ScanState, scannerUrl: String?) {
         monarchy.runTransactionSync {
-            ContentScanResultEntity.getOrCreate(it, mxcUrl, scannerUrl).scanResult = state
+            ContentScanResultEntity.getOrCreate(it, mxcUrl, scannerUrl, clock.epochMillis()).scanResult = state
         }
     }
 
     override fun updateScanResultForContent(mxcUrl: String, scannerUrl: String?, state: ScanState, humanReadable: String) {
         monarchy.runTransactionSync {
-            ContentScanResultEntity.getOrCreate(it, mxcUrl, scannerUrl).apply {
+            ContentScanResultEntity.getOrCreate(it, mxcUrl, scannerUrl, clock.epochMillis()).apply {
                 scanResult = state
-                scanDateTimestamp = System.currentTimeMillis()
+                scanDateTimestamp = clock.epochMillis()
                 humanReadableMessage = humanReadable
             }
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
index 44e13d971a..e9097e4d03 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
@@ -94,10 +94,12 @@ internal class DefaultGetHomeServerCapabilitiesTask @Inject constructor(
         }.getOrNull()
 
         val wellknownResult = runCatching {
-            getWellknownTask.execute(GetWellknownTask.Params(
-                    domain = userId.getDomain(),
-                    homeServerConnectionConfig = homeServerConnectionConfig
-            ))
+            getWellknownTask.execute(
+                    GetWellknownTask.Params(
+                            domain = userId.getDomain(),
+                            homeServerConnectionConfig = homeServerConnectionConfig
+                    )
+            )
         }.getOrNull()
 
         insertInDb(capabilities, mediaConfig, versions, wellknownResult)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
index 4285f38893..74838afc65 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
@@ -218,9 +218,11 @@ internal class DefaultIdentityService @Inject constructor(
             listeners.toList().forEach { tryOrNull { it.onIdentityServerChange() } }
         }
 
-        updateUserAccountDataTask.execute(UpdateUserAccountDataTask.IdentityParams(
-                identityContent = IdentityServerContent(baseUrl = url)
-        ))
+        updateUserAccountDataTask.execute(
+                UpdateUserAccountDataTask.IdentityParams(
+                        identityContent = IdentityServerContent(baseUrl = url)
+                )
+        )
     }
 
     override fun getUserConsent(): Boolean {
@@ -297,11 +299,13 @@ internal class DefaultIdentityService @Inject constructor(
     }
 
     override suspend fun sign3pidInvitation(identiyServer: String, token: String, secret: String): SignInvitationResult {
-        return sign3pidInvitationTask.execute(Sign3pidInvitationTask.Params(
-                url = identiyServer,
-                token = token,
-                privateKey = secret
-        ))
+        return sign3pidInvitationTask.execute(
+                Sign3pidInvitationTask.Params(
+                        url = identiyServer,
+                        token = token,
+                        privateKey = secret
+                )
+        )
     }
 
     override fun addListener(listener: IdentityServiceListener) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt
index f6ef370f8d..f642ed4cf2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt
@@ -83,11 +83,13 @@ internal class DefaultIdentityBulkLookupTask @Inject constructor(
         return try {
             LookUpData(hashedAddresses,
                     executeRequest(null) {
-                        identityAPI.lookup(IdentityLookUpParams(
-                                hashedAddresses,
-                                IdentityHashDetailResponse.ALGORITHM_SHA256,
-                                hashDetailResponse.pepper
-                        ))
+                        identityAPI.lookup(
+                                IdentityLookUpParams(
+                                        hashedAddresses,
+                                        IdentityHashDetailResponse.ALGORITHM_SHA256,
+                                        hashDetailResponse.pepper
+                                )
+                        )
                     })
         } catch (failure: Throwable) {
             // Catch invalid hash pepper and retry
@@ -117,8 +119,10 @@ internal class DefaultIdentityBulkLookupTask @Inject constructor(
         return withOlmUtility { olmUtility ->
             threePids.map { threePid ->
                 base64ToBase64Url(
-                        olmUtility.sha256(threePid.value.lowercase(Locale.ROOT) +
-                                " " + threePid.toMedium() + " " + pepper)
+                        olmUtility.sha256(
+                                threePid.value.lowercase(Locale.ROOT) +
+                                        " " + threePid.toMedium() + " " + pepper
+                        )
                 )
             }
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt
index 9c89048176..fe12309650 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt
@@ -57,18 +57,22 @@ internal class DefaultIdentityRequestTokenForBindingTask @Inject constructor(
 
         val tokenResponse = executeRequest(null) {
             when (params.threePid) {
-                is ThreePid.Email  -> identityAPI.requestTokenToBindEmail(IdentityRequestTokenForEmailBody(
-                        clientSecret = clientSecret,
-                        sendAttempt = sendAttempt,
-                        email = params.threePid.email
-                ))
+                is ThreePid.Email  -> identityAPI.requestTokenToBindEmail(
+                        IdentityRequestTokenForEmailBody(
+                                clientSecret = clientSecret,
+                                sendAttempt = sendAttempt,
+                                email = params.threePid.email
+                        )
+                )
                 is ThreePid.Msisdn -> {
-                    identityAPI.requestTokenToBindMsisdn(IdentityRequestTokenForMsisdnBody(
-                            clientSecret = clientSecret,
-                            sendAttempt = sendAttempt,
-                            phoneNumber = params.threePid.msisdn,
-                            countryCode = params.threePid.getCountryCode()
-                    ))
+                    identityAPI.requestTokenToBindMsisdn(
+                            IdentityRequestTokenForMsisdnBody(
+                                    clientSecret = clientSecret,
+                                    sendAttempt = sendAttempt,
+                                    phoneNumber = params.threePid.msisdn,
+                                    countryCode = params.threePid.getCountryCode()
+                            )
+                    )
                 }
             }
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt
index f884e2816d..fcf8ce6317 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt
@@ -50,7 +50,8 @@ internal class DefaultIdentitySubmitTokenForBindingTask @Inject constructor(
                             clientSecret = identityPendingBinding.clientSecret,
                             sid = identityPendingBinding.sid,
                             token = params.token
-                    ))
+                    )
+            )
         }
 
         if (!tokenResponse.isSuccess()) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityRealmModule.kt
index 1f2cfad33c..5e9068ecf7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityRealmModule.kt
@@ -21,9 +21,11 @@ import io.realm.annotations.RealmModule
 /**
  * Realm module for identity server classes
  */
-@RealmModule(library = true,
+@RealmModule(
+        library = true,
         classes = [
             IdentityDataEntity::class,
             IdentityPendingBindingEntity::class
-        ])
+        ]
+)
 internal class IdentityRealmModule
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/DefaultSyncStatusService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/DefaultSyncStatusService.kt
index 4a1e6661b0..c138c1a40e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/DefaultSyncStatusService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/DefaultSyncStatusService.kt
@@ -24,7 +24,7 @@ import javax.inject.Inject
 
 @SessionScope
 internal class DefaultSyncStatusService @Inject constructor() :
-    SyncStatusService,
+        SyncStatusService,
         ProgressReporter {
 
     private val status = MutableLiveData<SyncStatusService.Status>()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt
index 30b1589169..1b96931c6c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt
@@ -59,7 +59,7 @@ internal class IntegrationManager @Inject constructor(matrixConfiguration: Matri
                                                       private val updateUserAccountDataTask: UpdateUserAccountDataTask,
                                                       private val accountDataDataSource: UserAccountDataDataSource,
                                                       private val widgetFactory: WidgetFactory) :
-    SessionLifecycleObserver {
+        SessionLifecycleObserver {
 
     private val currentConfigs = ArrayList<IntegrationManagerConfig>()
     private val lifecycleOwner: LifecycleOwner = LifecycleOwner { lifecycleRegistry }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/ViaParameterFinder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/ViaParameterFinder.kt
index dff82cb42e..d20cf8f140 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/ViaParameterFinder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/ViaParameterFinder.kt
@@ -72,6 +72,7 @@ internal class ViaParameterFinder @Inject constructor(
      */
     private fun getUserIdsOfJoinedMembers(roomId: String): Set<String> {
         return roomGetterProvider.get().getRoom(roomId)
+                ?.membershipService()
                 ?.getRoomMembers(roomMemberQueryParams { memberships = listOf(Membership.JOIN) })
                 ?.map { it.userId }
                 .orEmpty()
@@ -84,6 +85,7 @@ internal class ViaParameterFinder @Inject constructor(
     // It may not be possible for a user to join a room if there's no overlap between these
     fun computeViaParamsForRestricted(roomId: String, max: Int): List<String> {
         val userThatCanInvite = roomGetterProvider.get().getRoom(roomId)
+                ?.membershipService()
                 ?.getRoomMembers(roomMemberQueryParams { memberships = listOf(Membership.JOIN) })
                 ?.map { it.userId }
                 ?.filter { userCanInvite(userId, roomId) }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt
index 87e51181e6..f630c2c225 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt
@@ -50,7 +50,8 @@ internal class DefaultBindThreePidsTask @Inject constructor(private val profileA
                             identityServerUrlWithoutProtocol = identityServerUrlWithoutProtocol,
                             identityServerAccessToken = identityServerAccessToken,
                             sid = identityPendingBinding.sid
-                    ))
+                    )
+            )
         }
 
         // Binding is over, cleanup the store
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
index 6f99577ac2..5e64a6af0e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
@@ -135,21 +135,25 @@ internal class DefaultProfileService @Inject constructor(private val taskExecuto
     override suspend fun finalizeAddingThreePid(threePid: ThreePid,
                                                 userInteractiveAuthInterceptor: UserInteractiveAuthInterceptor) {
         finalizeAddingThreePidTask
-                .execute(FinalizeAddingThreePidTask.Params(
-                        threePid = threePid,
-                        userInteractiveAuthInterceptor = userInteractiveAuthInterceptor,
-                        userWantsToCancel = false
-                ))
+                .execute(
+                        FinalizeAddingThreePidTask.Params(
+                                threePid = threePid,
+                                userInteractiveAuthInterceptor = userInteractiveAuthInterceptor,
+                                userWantsToCancel = false
+                        )
+                )
         refreshThreePids()
     }
 
     override suspend fun cancelAddingThreePid(threePid: ThreePid) {
         finalizeAddingThreePidTask
-                .execute(FinalizeAddingThreePidTask.Params(
-                        threePid = threePid,
-                        userInteractiveAuthInterceptor = null,
-                        userWantsToCancel = true
-                ))
+                .execute(
+                        FinalizeAddingThreePidTask.Params(
+                                threePid = threePid,
+                                userInteractiveAuthInterceptor = null,
+                                userWantsToCancel = true
+                        )
+                )
         refreshThreePids()
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt
index 6ff4efaf11..501aff63bd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt
@@ -22,6 +22,7 @@ import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.toRegistrationFlowResponse
 import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.uia.UiaResult
 import org.matrix.android.sdk.internal.auth.registration.handleUIA
 import org.matrix.android.sdk.internal.database.model.PendingThreePidEntity
 import org.matrix.android.sdk.internal.database.model.PendingThreePidEntityFields
@@ -72,13 +73,13 @@ internal class DefaultFinalizeAddingThreePidTask @Inject constructor(
                 true
             } catch (throwable: Throwable) {
                 if (params.userInteractiveAuthInterceptor == null ||
-                        !handleUIA(
+                        handleUIA(
                                 failure = throwable,
                                 interceptor = params.userInteractiveAuthInterceptor,
                                 retryBlock = { authUpdate ->
                                     execute(params.copy(userAuthParam = authUpdate))
                                 }
-                        )
+                        ) != UiaResult.SUCCESS
                 ) {
                     Timber.d("## UIA: propagate failure")
                     throw throwable.toRegistrationFlowResponse()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt
index df8a1c97ff..acbecc9fbe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt
@@ -45,7 +45,8 @@ internal class DefaultUnbindThreePidsTask @Inject constructor(private val profil
                             identityServerUrlWithoutProtocol,
                             params.threePid.toMedium(),
                             params.threePid.value
-                    ))
+                    )
+            )
         }.isSuccess()
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPushRuleTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPushRuleTask.kt
index b217687168..c46474cf90 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPushRuleTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPushRuleTask.kt
@@ -15,8 +15,8 @@
  */
 package org.matrix.android.sdk.internal.session.pushers
 
-import org.matrix.android.sdk.api.pushrules.RuleKind
-import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.session.pushrules.RuleKind
+import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.task.Task
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPusherWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPusherWorker.kt
index ce29efaaac..0042558027 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPusherWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPusherWorker.kt
@@ -26,7 +26,7 @@ import org.matrix.android.sdk.internal.worker.SessionWorkerParams
 import javax.inject.Inject
 
 internal class AddPusherWorker(context: Context, params: WorkerParameters, sessionManager: SessionManager) :
-    SessionSafeCoroutineWorker<AddPusherWorker.Params>(context, params, sessionManager, Params::class.java) {
+        SessionSafeCoroutineWorker<AddPusherWorker.Params>(context, params, sessionManager, Params::class.java) {
 
     @JsonClass(generateAdapter = true)
     internal data class Params(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultConditionResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultConditionResolver.kt
index 84a05067be..67fba390d0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultConditionResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultConditionResolver.kt
@@ -15,14 +15,15 @@
  */
 package org.matrix.android.sdk.internal.session.pushers
 
-import org.matrix.android.sdk.api.pushrules.ConditionResolver
-import org.matrix.android.sdk.api.pushrules.ContainsDisplayNameCondition
-import org.matrix.android.sdk.api.pushrules.EventMatchCondition
-import org.matrix.android.sdk.api.pushrules.RoomMemberCountCondition
-import org.matrix.android.sdk.api.pushrules.SenderNotificationPermissionCondition
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.pushrules.ConditionResolver
+import org.matrix.android.sdk.api.session.pushrules.ContainsDisplayNameCondition
+import org.matrix.android.sdk.api.session.pushrules.EventMatchCondition
+import org.matrix.android.sdk.api.session.pushrules.RoomMemberCountCondition
+import org.matrix.android.sdk.api.session.pushrules.SenderNotificationPermissionCondition
+import org.matrix.android.sdk.api.session.room.getStateEvent
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.room.RoomGetter
@@ -60,7 +61,7 @@ internal class DefaultConditionResolver @Inject constructor(
                                                      condition: ContainsDisplayNameCondition): Boolean {
         val roomId = event.roomId ?: return false
         val room = roomGetter.getRoom(roomId) ?: return false
-        val myDisplayName = room.getRoomMember(userId)?.displayName ?: return false
+        val myDisplayName = room.membershipService().getRoomMember(userId)?.displayName ?: return false
         return condition.isSatisfied(event, myDisplayName)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
index e87c27e601..13b990a9ff 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
@@ -85,17 +85,19 @@ internal class DefaultPushersService @Inject constructor(
                                         deviceDisplayName: String,
                                         append: Boolean) {
         addPusherTask.execute(
-                AddPusherTask.Params(JsonPusher(
-                        pushKey = email,
-                        kind = Pusher.KIND_EMAIL,
-                        appId = Pusher.APP_ID_EMAIL,
-                        profileTag = "",
-                        lang = lang,
-                        appDisplayName = appDisplayName,
-                        deviceDisplayName = deviceDisplayName,
-                        data = JsonPusherData(brand = emailBranding),
-                        append = append
-                ))
+                AddPusherTask.Params(
+                        JsonPusher(
+                                pushKey = email,
+                                kind = Pusher.KIND_EMAIL,
+                                appId = Pusher.APP_ID_EMAIL,
+                                profileTag = "",
+                                lang = lang,
+                                appDisplayName = appDisplayName,
+                                deviceDisplayName = deviceDisplayName,
+                                data = JsonPusherData(brand = emailBranding),
+                                append = append
+                        )
+                )
         )
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/GetPushRulesResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushRulesResponse.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/GetPushRulesResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushRulesResponse.kt
index 35b4d77c0e..de03819629 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/GetPushRulesResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushRulesResponse.kt
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.matrix.android.sdk.api.pushrules.rest
+package org.matrix.android.sdk.internal.session.pushers
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import org.matrix.android.sdk.api.session.pushrules.rest.RuleSet
 
 /**
  * All push rulesets for a user.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt
index 994b4860c6..dab6d37317 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt
@@ -15,8 +15,7 @@
  */
 package org.matrix.android.sdk.internal.session.pushers
 
-import org.matrix.android.sdk.api.pushrules.rest.GetPushRulesResponse
-import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
 import org.matrix.android.sdk.internal.network.NetworkConstants
 import retrofit2.http.Body
 import retrofit2.http.DELETE
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt
index d53a4eed65..4528c95e69 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt
@@ -19,14 +19,14 @@ package org.matrix.android.sdk.internal.session.pushers
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import org.matrix.android.sdk.api.pushrules.ConditionResolver
-import org.matrix.android.sdk.api.pushrules.PushRuleService
 import org.matrix.android.sdk.api.session.pushers.PushersService
-import org.matrix.android.sdk.internal.session.notification.DefaultProcessEventForPushTask
-import org.matrix.android.sdk.internal.session.notification.DefaultPushRuleService
-import org.matrix.android.sdk.internal.session.notification.ProcessEventForPushTask
+import org.matrix.android.sdk.api.session.pushrules.ConditionResolver
+import org.matrix.android.sdk.api.session.pushrules.PushRuleService
 import org.matrix.android.sdk.internal.session.pushers.gateway.DefaultPushGatewayNotifyTask
 import org.matrix.android.sdk.internal.session.pushers.gateway.PushGatewayNotifyTask
+import org.matrix.android.sdk.internal.session.pushrules.DefaultProcessEventForPushTask
+import org.matrix.android.sdk.internal.session.pushrules.DefaultPushRuleService
+import org.matrix.android.sdk.internal.session.pushrules.ProcessEventForPushTask
 import org.matrix.android.sdk.internal.session.room.notification.DefaultSetRoomNotificationStateTask
 import org.matrix.android.sdk.internal.session.room.notification.SetRoomNotificationStateTask
 import retrofit2.Retrofit
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt
index bae893608b..9b0bf7934b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt
@@ -15,7 +15,7 @@
  */
 package org.matrix.android.sdk.internal.session.pushers
 
-import org.matrix.android.sdk.api.pushrules.RuleKind
+import org.matrix.android.sdk.api.session.pushrules.RuleKind
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.task.Task
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/SavePushRulesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/SavePushRulesTask.kt
index 6a4b891ecf..ff685e9281 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/SavePushRulesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/SavePushRulesTask.kt
@@ -16,9 +16,8 @@
 package org.matrix.android.sdk.internal.session.pushers
 
 import com.zhuinden.monarchy.Monarchy
-import org.matrix.android.sdk.api.pushrules.RuleScope
-import org.matrix.android.sdk.api.pushrules.RuleSetKey
-import org.matrix.android.sdk.api.pushrules.rest.GetPushRulesResponse
+import org.matrix.android.sdk.api.session.pushrules.RuleScope
+import org.matrix.android.sdk.api.session.pushrules.RuleSetKey
 import org.matrix.android.sdk.internal.database.mapper.PushRulesMapper
 import org.matrix.android.sdk.internal.database.model.PushRulesEntity
 import org.matrix.android.sdk.internal.database.model.deleteOnCascade
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt
index 33589dc55b..454b9cdd80 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt
@@ -15,9 +15,9 @@
  */
 package org.matrix.android.sdk.internal.session.pushers
 
-import org.matrix.android.sdk.api.pushrules.Action
-import org.matrix.android.sdk.api.pushrules.RuleKind
-import org.matrix.android.sdk.api.pushrules.toJson
+import org.matrix.android.sdk.api.session.pushrules.Action
+import org.matrix.android.sdk.api.session.pushrules.RuleKind
+import org.matrix.android.sdk.api.session.pushrules.toJson
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.task.Task
@@ -38,18 +38,18 @@ internal class DefaultUpdatePushRuleActionsTask @Inject constructor(
 ) : UpdatePushRuleActionsTask {
 
     override suspend fun execute(params: UpdatePushRuleActionsTask.Params) {
+        executeRequest(globalErrorReceiver) {
+            pushRulesApi.updateEnableRuleStatus(
+                    params.kind.value,
+                    params.ruleId,
+                    EnabledBody(params.enable)
+            )
+        }
+        if (params.actions != null) {
+            val body = mapOf("actions" to params.actions.toJson())
             executeRequest(globalErrorReceiver) {
-                pushRulesApi.updateEnableRuleStatus(
-                        params.kind.value,
-                        params.ruleId,
-                        EnabledBody(params.enable)
-                )
-            }
-            if (params.actions != null) {
-                val body = mapOf("actions" to params.actions.toJson())
-                executeRequest(globalErrorReceiver) {
-                    pushRulesApi.updateRuleActions(params.kind.value, params.ruleId, body)
-                }
+                pushRulesApi.updateRuleActions(params.kind.value, params.ruleId, body)
             }
+        }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt
index 3fe1614678..815661a1ce 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt
@@ -15,8 +15,8 @@
  */
 package org.matrix.android.sdk.internal.session.pushers
 
-import org.matrix.android.sdk.api.pushrules.RuleKind
-import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.session.pushrules.RuleKind
+import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.task.Task
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/DefaultPushRuleService.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/DefaultPushRuleService.kt
index cdc7350f8b..ace23f1fe5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/DefaultPushRuleService.kt
@@ -13,23 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.matrix.android.sdk.internal.session.notification
+package org.matrix.android.sdk.internal.session.pushrules
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import com.zhuinden.monarchy.Monarchy
-import org.matrix.android.sdk.api.pushrules.Action
-import org.matrix.android.sdk.api.pushrules.ConditionResolver
-import org.matrix.android.sdk.api.pushrules.PushEvents
-import org.matrix.android.sdk.api.pushrules.PushRuleService
-import org.matrix.android.sdk.api.pushrules.RuleKind
-import org.matrix.android.sdk.api.pushrules.RuleScope
-import org.matrix.android.sdk.api.pushrules.RuleSetKey
-import org.matrix.android.sdk.api.pushrules.SenderNotificationPermissionCondition
-import org.matrix.android.sdk.api.pushrules.getActions
-import org.matrix.android.sdk.api.pushrules.rest.PushRule
-import org.matrix.android.sdk.api.pushrules.rest.RuleSet
 import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.pushrules.Action
+import org.matrix.android.sdk.api.session.pushrules.ConditionResolver
+import org.matrix.android.sdk.api.session.pushrules.PushEvents
+import org.matrix.android.sdk.api.session.pushrules.PushRuleService
+import org.matrix.android.sdk.api.session.pushrules.RuleKind
+import org.matrix.android.sdk.api.session.pushrules.RuleScope
+import org.matrix.android.sdk.api.session.pushrules.RuleSetKey
+import org.matrix.android.sdk.api.session.pushrules.SenderNotificationPermissionCondition
+import org.matrix.android.sdk.api.session.pushrules.getActions
+import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.session.pushrules.rest.RuleSet
 import org.matrix.android.sdk.internal.database.mapper.PushRulesMapper
 import org.matrix.android.sdk.internal.database.model.PushRuleEntity
 import org.matrix.android.sdk.internal.database.model.PushRulesEntity
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/ProcessEventForPushTask.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/ProcessEventForPushTask.kt
index 899bce4c8d..60c1194708 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/ProcessEventForPushTask.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.notification
+package org.matrix.android.sdk.internal.session.pushrules
 
-import org.matrix.android.sdk.api.pushrules.PushEvents
-import org.matrix.android.sdk.api.pushrules.rest.PushRule
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.isInvitation
+import org.matrix.android.sdk.api.session.pushrules.PushEvents
+import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
 import org.matrix.android.sdk.api.session.sync.model.RoomsSyncResponse
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.task.Task
@@ -67,8 +67,10 @@ internal class DefaultProcessEventForPushTask @Inject constructor(
         }.filter {
             it.senderId != userId
         }
-        Timber.v("[PushRules] Found ${allEvents.size} out of ${(newJoinEvents + inviteEvents).size}" +
-                " to check for push rules with ${params.rules.size} rules")
+        Timber.v(
+                "[PushRules] Found ${allEvents.size} out of ${(newJoinEvents + inviteEvents).size}" +
+                        " to check for push rules with ${params.rules.size} rules"
+        )
         val matchedEvents = allEvents.mapNotNull { event ->
             pushRuleFinder.fulfilledBingRule(event, params.rules)?.let {
                 Timber.v("[PushRules] Rule $it match for event ${event.eventId}")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/PushRuleFinder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/PushRuleFinder.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/PushRuleFinder.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/PushRuleFinder.kt
index 6e302d373d..b9d06a934d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/PushRuleFinder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushrules/PushRuleFinder.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.notification
+package org.matrix.android.sdk.internal.session.pushrules
 
-import org.matrix.android.sdk.api.pushrules.ConditionResolver
-import org.matrix.android.sdk.api.pushrules.rest.PushRule
 import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.pushrules.ConditionResolver
+import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
 import javax.inject.Inject
 
 internal class PushRuleFinder @Inject constructor(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
index 3f129c4d71..7326adee4c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
@@ -18,13 +18,11 @@ package org.matrix.android.sdk.internal.session.room
 
 import androidx.lifecycle.LiveData
 import org.matrix.android.sdk.api.MatrixCoroutineDispatchers
-import org.matrix.android.sdk.api.crypto.MXCRYPTO_ALGORITHM_MEGOLM
-import org.matrix.android.sdk.api.session.crypto.CryptoService
-import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.accountdata.RoomAccountDataService
 import org.matrix.android.sdk.api.session.room.alias.AliasService
 import org.matrix.android.sdk.api.session.room.call.RoomCallService
+import org.matrix.android.sdk.api.session.room.crypto.RoomCryptoService
 import org.matrix.android.sdk.api.session.room.members.MembershipService
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.RoomType
@@ -42,62 +40,37 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineService
 import org.matrix.android.sdk.api.session.room.typing.TypingService
 import org.matrix.android.sdk.api.session.room.uploads.UploadsService
 import org.matrix.android.sdk.api.session.room.version.RoomVersionService
-import org.matrix.android.sdk.api.session.search.SearchResult
 import org.matrix.android.sdk.api.session.space.Space
 import org.matrix.android.sdk.api.util.Optional
-import org.matrix.android.sdk.api.util.awaitCallback
 import org.matrix.android.sdk.internal.session.permalinks.ViaParameterFinder
-import org.matrix.android.sdk.internal.session.room.state.SendStateTask
 import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
-import org.matrix.android.sdk.internal.session.search.SearchTask
 import org.matrix.android.sdk.internal.session.space.DefaultSpace
-import java.security.InvalidParameterException
 
-internal class DefaultRoom(override val roomId: String,
-                           private val roomSummaryDataSource: RoomSummaryDataSource,
-                           private val timelineService: TimelineService,
-                           private val threadsService: ThreadsService,
-                           private val threadsLocalService: ThreadsLocalService,
-                           private val sendService: SendService,
-                           private val draftService: DraftService,
-                           private val stateService: StateService,
-                           private val uploadsService: UploadsService,
-                           private val reportingService: ReportingService,
-                           private val roomCallService: RoomCallService,
-                           private val readService: ReadService,
-                           private val typingService: TypingService,
-                           private val aliasService: AliasService,
-                           private val tagsService: TagsService,
-                           private val cryptoService: CryptoService,
-                           private val relationService: RelationService,
-                           private val roomMembersService: MembershipService,
-                           private val roomPushRuleService: RoomPushRuleService,
-                           private val roomAccountDataService: RoomAccountDataService,
-                           private val roomVersionService: RoomVersionService,
-                           private val sendStateTask: SendStateTask,
-                           private val viaParameterFinder: ViaParameterFinder,
-                           private val searchTask: SearchTask,
-                           override val coroutineDispatchers: MatrixCoroutineDispatchers
-) :
-        Room,
-        TimelineService by timelineService,
-        ThreadsService by threadsService,
-        ThreadsLocalService by threadsLocalService,
-        SendService by sendService,
-        DraftService by draftService,
-        StateService by stateService,
-        UploadsService by uploadsService,
-        ReportingService by reportingService,
-        RoomCallService by roomCallService,
-        ReadService by readService,
-        TypingService by typingService,
-        AliasService by aliasService,
-        TagsService by tagsService,
-        RelationService by relationService,
-        MembershipService by roomMembersService,
-        RoomPushRuleService by roomPushRuleService,
-        RoomAccountDataService by roomAccountDataService,
-        RoomVersionService by roomVersionService {
+internal class DefaultRoom(
+        override val roomId: String,
+        private val roomSummaryDataSource: RoomSummaryDataSource,
+        private val roomCryptoService: RoomCryptoService,
+        private val timelineService: TimelineService,
+        private val threadsService: ThreadsService,
+        private val threadsLocalService: ThreadsLocalService,
+        private val sendService: SendService,
+        private val draftService: DraftService,
+        private val stateService: StateService,
+        private val uploadsService: UploadsService,
+        private val reportingService: ReportingService,
+        private val roomCallService: RoomCallService,
+        private val readService: ReadService,
+        private val typingService: TypingService,
+        private val aliasService: AliasService,
+        private val tagsService: TagsService,
+        private val relationService: RelationService,
+        private val roomMembersService: MembershipService,
+        private val roomPushRuleService: RoomPushRuleService,
+        private val roomAccountDataService: RoomAccountDataService,
+        private val roomVersionService: RoomVersionService,
+        private val viaParameterFinder: ViaParameterFinder,
+        override val coroutineDispatchers: MatrixCoroutineDispatchers
+) : Room {
 
     override fun getRoomSummaryLive(): LiveData<Optional<RoomSummary>> {
         return roomSummaryDataSource.getRoomSummaryLive(roomId)
@@ -107,69 +80,28 @@ internal class DefaultRoom(override val roomId: String,
         return roomSummaryDataSource.getRoomSummary(roomId)
     }
 
-    override fun isEncrypted(): Boolean {
-        return cryptoService.isRoomEncrypted(roomId)
-    }
-
-    override fun encryptionAlgorithm(): String? {
-        return cryptoService.getEncryptionAlgorithm(roomId)
-    }
-
-    override fun shouldEncryptForInvitedMembers(): Boolean {
-        return cryptoService.shouldEncryptForInvitedMembers(roomId)
-    }
-
-    override suspend fun prepareToEncrypt() {
-        awaitCallback<Unit> {
-            cryptoService.prepareToEncrypt(roomId, it)
-        }
-    }
-
-    override suspend fun enableEncryption(algorithm: String, force: Boolean) {
-        when {
-            (!force && isEncrypted() && encryptionAlgorithm() == MXCRYPTO_ALGORITHM_MEGOLM) -> {
-                throw IllegalStateException("Encryption is already enabled for this room")
-            }
-            (!force && algorithm != MXCRYPTO_ALGORITHM_MEGOLM)                              -> {
-                throw InvalidParameterException("Only MXCRYPTO_ALGORITHM_MEGOLM algorithm is supported")
-            }
-            else                                                                            -> {
-                val params = SendStateTask.Params(
-                        roomId = roomId,
-                        stateKey = "",
-                        eventType = EventType.STATE_ROOM_ENCRYPTION,
-                        body = mapOf(
-                                "algorithm" to algorithm
-                        ))
-
-                sendStateTask.execute(params)
-            }
-        }
-    }
-
-    override suspend fun search(searchTerm: String,
-                                nextBatch: String?,
-                                orderByRecent: Boolean,
-                                limit: Int,
-                                beforeLimit: Int,
-                                afterLimit: Int,
-                                includeProfile: Boolean): SearchResult {
-        return searchTask.execute(
-                SearchTask.Params(
-                        searchTerm = searchTerm,
-                        roomId = roomId,
-                        nextBatch = nextBatch,
-                        orderByRecent = orderByRecent,
-                        limit = limit,
-                        beforeLimit = beforeLimit,
-                        afterLimit = afterLimit,
-                        includeProfile = includeProfile
-                )
-        )
-    }
-
     override fun asSpace(): Space? {
         if (roomSummary()?.roomType != RoomType.SPACE) return null
         return DefaultSpace(this, roomSummaryDataSource, viaParameterFinder)
     }
+
+    override fun timelineService() = timelineService
+    override fun threadsService() = threadsService
+    override fun threadsLocalService() = threadsLocalService
+    override fun sendService() = sendService
+    override fun draftService() = draftService
+    override fun stateService() = stateService
+    override fun uploadsService() = uploadsService
+    override fun reportingService() = reportingService
+    override fun roomCallService() = roomCallService
+    override fun readService() = readService
+    override fun typingService() = typingService
+    override fun aliasService() = aliasService
+    override fun tagsService() = tagsService
+    override fun relationService() = relationService
+    override fun roomCryptoService() = roomCryptoService
+    override fun membershipService() = roomMembersService
+    override fun roomPushRuleService() = roomPushRuleService
+    override fun roomAccountDataService() = roomAccountDataService
+    override fun roomVersionService() = roomVersionService
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
index 15ce5810c8..7e0b44a314 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
@@ -28,14 +28,16 @@ import org.matrix.android.sdk.api.session.events.model.content.EncryptedEventCon
 import org.matrix.android.sdk.api.session.events.model.getRelationContent
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.api.session.room.model.PollSummaryContent
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.model.ReferencesAggregatedContent
 import org.matrix.android.sdk.api.session.room.model.VoteInfo
 import org.matrix.android.sdk.api.session.room.model.VoteSummary
+import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconInfoContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconLocationDataContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageEndPollContent
-import org.matrix.android.sdk.api.session.room.model.message.MessageLiveLocationContent
 import org.matrix.android.sdk.api.session.room.model.message.MessagePollContent
 import org.matrix.android.sdk.api.session.room.model.message.MessagePollResponseContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageRelationContent
@@ -67,6 +69,7 @@ import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.EventInsertLiveProcessor
 import org.matrix.android.sdk.internal.session.room.aggregation.livelocation.LiveLocationAggregationProcessor
 import org.matrix.android.sdk.internal.session.room.state.StateEventDataSource
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -75,7 +78,8 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
         private val stateEventDataSource: StateEventDataSource,
         @SessionId private val sessionId: String,
         private val sessionManager: SessionManager,
-        private val liveLocationAggregationProcessor: LiveLocationAggregationProcessor
+        private val liveLocationAggregationProcessor: LiveLocationAggregationProcessor,
+        private val clock: Clock,
 ) : EventInsertLiveProcessor {
 
     private val allowedTypes = listOf(
@@ -91,7 +95,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
             // EventType.KEY_VERIFICATION_READY,
             EventType.KEY_VERIFICATION_KEY,
             EventType.ENCRYPTED
-    ) + EventType.POLL_START + EventType.POLL_RESPONSE + EventType.POLL_END + EventType.BEACON_LOCATION_DATA
+    ) + EventType.POLL_START + EventType.POLL_RESPONSE + EventType.POLL_END + EventType.STATE_ROOM_BEACON_INFO + EventType.BEACON_LOCATION_DATA
 
     override fun shouldProcess(eventId: String, eventType: String, insertType: EventInsertType): Boolean {
         return allowedTypes.contains(eventType)
@@ -106,12 +110,12 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
             }
             val isLocalEcho = LocalEcho.isLocalEchoId(event.eventId ?: "")
             when (event.type) {
-                EventType.REACTION                -> {
+                EventType.REACTION                  -> {
                     // we got a reaction!!
                     Timber.v("###REACTION in room $roomId , reaction eventID ${event.eventId}")
                     handleReaction(realm, event, roomId, isLocalEcho)
                 }
-                EventType.MESSAGE                 -> {
+                EventType.MESSAGE                   -> {
                     if (event.unsignedData?.relations?.annotations != null) {
                         Timber.v("###REACTION Aggregation in room $roomId for event ${event.eventId}")
                         handleInitialAggregatedRelations(realm, event, roomId, event.unsignedData.relations.annotations)
@@ -137,7 +141,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
                 EventType.KEY_VERIFICATION_START,
                 EventType.KEY_VERIFICATION_MAC,
                 EventType.KEY_VERIFICATION_READY,
-                EventType.KEY_VERIFICATION_KEY    -> {
+                EventType.KEY_VERIFICATION_KEY      -> {
                     Timber.v("## SAS REF in room $roomId for event ${event.eventId}")
                     event.content.toModel<MessageRelationContent>()?.relatesTo?.let {
                         if (it.type == RelationType.REFERENCE && it.eventId != null) {
@@ -146,7 +150,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
                     }
                 }
 
-                EventType.ENCRYPTED               -> {
+                EventType.ENCRYPTED                 -> {
                     // Relation type is in clear
                     val encryptedEventContent = event.content.toModel<EncryptedEventContent>()
                     if (encryptedEventContent?.relatesTo?.type == RelationType.REPLACE ||
@@ -189,8 +193,8 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
                                 }
                             }
                             in EventType.BEACON_LOCATION_DATA -> {
-                                event.content.toModel<MessageLiveLocationContent>(catchError = true)?.let {
-                                    liveLocationAggregationProcessor.handleLiveLocation(realm, event, it, roomId, isLocalEcho)
+                                event.getClearContent().toModel<MessageBeaconLocationDataContent>(catchError = true)?.let {
+                                    liveLocationAggregationProcessor.handleBeaconLocationData(realm, event, it, roomId, isLocalEcho)
                                 }
                             }
                         }
@@ -213,7 +217,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
 //                                 }
 //                    }
                 }
-                EventType.REDACTION               -> {
+                EventType.REDACTION                 -> {
                     val eventToPrune = event.redacts?.let { EventEntity.where(realm, eventId = it).findFirst() }
                             ?: return
                     when (eventToPrune.type) {
@@ -233,7 +237,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
                         }
                     }
                 }
-                in EventType.POLL_START           -> {
+                in EventType.POLL_START             -> {
                     val content: MessagePollContent? = event.content.toModel()
                     if (content?.relatesTo?.type == RelationType.REPLACE) {
                         Timber.v("###REPLACE in room $roomId for event ${event.eventId}")
@@ -241,22 +245,22 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
                         handleReplace(realm, event, content, roomId, isLocalEcho)
                     }
                 }
-                in EventType.POLL_RESPONSE        -> {
+                in EventType.POLL_RESPONSE          -> {
                     event.content.toModel<MessagePollResponseContent>(catchError = true)?.let {
                         handleResponse(realm, event, it, roomId, isLocalEcho)
                     }
                 }
-                in EventType.POLL_END             -> {
+                in EventType.POLL_END               -> {
                     event.content.toModel<MessageEndPollContent>(catchError = true)?.let {
                         handleEndPoll(realm, event, it, roomId, isLocalEcho)
                     }
                 }
-                in EventType.BEACON_LOCATION_DATA -> {
-                    event.content.toModel<MessageLiveLocationContent>(catchError = true)?.let {
-                        liveLocationAggregationProcessor.handleLiveLocation(realm, event, it, roomId, isLocalEcho)
+                in EventType.STATE_ROOM_BEACON_INFO -> {
+                    event.content.toModel<MessageBeaconInfoContent>(catchError = true)?.let {
+                        liveLocationAggregationProcessor.handleBeaconInfo(realm, event, it, roomId, isLocalEcho)
                     }
                 }
-                else                              -> Timber.v("UnHandled event ${event.eventId}")
+                else                                -> Timber.v("UnHandled event ${event.eventId}")
             }
         } catch (t: Throwable) {
             Timber.e(t, "## Should not happen ")
@@ -325,7 +329,8 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
                                         totalVotes = 0,
                                         winnerVoteCount = 0,
                                 )
-                                        .toContent())
+                                        .toContent()
+                        )
                     }
 
             val txId = event.unsignedData?.transactionId
@@ -335,7 +340,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
                 Timber.v("###REPLACE Receiving remote echo of edit (edit already done)")
                 existingSummary.editions.firstOrNull { it.eventId == txId }?.let {
                     it.eventId = event.eventId
-                    it.timestamp = event.originServerTs ?: System.currentTimeMillis()
+                    it.timestamp = event.originServerTs ?: clock.epochMillis()
                     it.isLocalEcho = false
                 }
             } else {
@@ -346,10 +351,10 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
                                 eventId = event.eventId,
                                 content = ContentMapper.map(newContent),
                                 timestamp = if (isLocalEcho) {
-                                    System.currentTimeMillis()
+                                    clock.epochMillis()
                                 } else {
                                     // Do not take local echo originServerTs here, could mess up ordering (keep old ts)
-                                    event.originServerTs ?: System.currentTimeMillis()
+                                    event.originServerTs ?: clock.epochMillis()
                                 },
                                 isLocalEcho = isLocalEcho
                         )
@@ -542,7 +547,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
 
     private fun getPollEvent(roomId: String, eventId: String): TimelineEvent? {
         val session = sessionManager.getSessionComponent(sessionId)?.session()
-        return session?.getRoom(roomId)?.getTimelineEvent(eventId) ?: return null.also {
+        return session?.roomService()?.getRoom(roomId)?.getTimelineEvent(eventId) ?: return null.also {
             Timber.v("## POLL target poll event $eventId not found in room $roomId")
         }
     }
@@ -729,11 +734,13 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
                 EventType.KEY_VERIFICATION_READY,
                 EventType.KEY_VERIFICATION_KEY,
                 EventType.KEY_VERIFICATION_MAC    -> currentState.toState(VerificationState.WAITING)
-                EventType.KEY_VERIFICATION_CANCEL -> currentState.toState(if (event.senderId == userId) {
-                    VerificationState.CANCELED_BY_ME
-                } else {
-                    VerificationState.CANCELED_BY_OTHER
-                })
+                EventType.KEY_VERIFICATION_CANCEL -> currentState.toState(
+                        if (event.senderId == userId) {
+                            VerificationState.CANCELED_BY_ME
+                        } else {
+                            VerificationState.CANCELED_BY_OTHER
+                        }
+                )
                 EventType.KEY_VERIFICATION_DONE   -> currentState.toState(VerificationState.DONE)
                 else                              -> VerificationState.REQUEST
             }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
index 10f75473b7..65ef94999f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
@@ -194,7 +194,8 @@ internal interface RoomAPI {
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/state/{state_event_type}")
     suspend fun sendStateEvent(@Path("roomId") roomId: String,
                                @Path("state_event_type") stateEventType: String,
-                               @Body params: JsonDict)
+                               @Body params: JsonDict
+    ): SendResponse
 
     /**
      * Send a generic state event
@@ -208,7 +209,8 @@ internal interface RoomAPI {
     suspend fun sendStateEvent(@Path("roomId") roomId: String,
                                @Path("state_event_type") stateEventType: String,
                                @Path("state_key") stateKey: String,
-                               @Body params: JsonDict)
+                               @Body params: JsonDict
+    ): SendResponse
 
     /**
      * Get state events of a room
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
index 72a3f9ab22..01c4fd1501 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
@@ -17,13 +17,13 @@
 package org.matrix.android.sdk.internal.session.room
 
 import org.matrix.android.sdk.api.MatrixCoroutineDispatchers
-import org.matrix.android.sdk.api.session.crypto.CryptoService
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.internal.session.SessionScope
 import org.matrix.android.sdk.internal.session.permalinks.ViaParameterFinder
 import org.matrix.android.sdk.internal.session.room.accountdata.DefaultRoomAccountDataService
 import org.matrix.android.sdk.internal.session.room.alias.DefaultAliasService
 import org.matrix.android.sdk.internal.session.room.call.DefaultRoomCallService
+import org.matrix.android.sdk.internal.session.room.crypto.DefaultRoomCryptoService
 import org.matrix.android.sdk.internal.session.room.draft.DefaultDraftService
 import org.matrix.android.sdk.internal.session.room.membership.DefaultMembershipService
 import org.matrix.android.sdk.internal.session.room.notification.DefaultRoomPushRuleService
@@ -32,7 +32,6 @@ import org.matrix.android.sdk.internal.session.room.relation.DefaultRelationServ
 import org.matrix.android.sdk.internal.session.room.reporting.DefaultReportingService
 import org.matrix.android.sdk.internal.session.room.send.DefaultSendService
 import org.matrix.android.sdk.internal.session.room.state.DefaultStateService
-import org.matrix.android.sdk.internal.session.room.state.SendStateTask
 import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
 import org.matrix.android.sdk.internal.session.room.tags.DefaultTagsService
 import org.matrix.android.sdk.internal.session.room.threads.DefaultThreadsService
@@ -41,7 +40,6 @@ import org.matrix.android.sdk.internal.session.room.timeline.DefaultTimelineServ
 import org.matrix.android.sdk.internal.session.room.typing.DefaultTypingService
 import org.matrix.android.sdk.internal.session.room.uploads.DefaultUploadsService
 import org.matrix.android.sdk.internal.session.room.version.DefaultRoomVersionService
-import org.matrix.android.sdk.internal.session.search.SearchTask
 import javax.inject.Inject
 
 internal interface RoomFactory {
@@ -49,36 +47,36 @@ internal interface RoomFactory {
 }
 
 @SessionScope
-internal class DefaultRoomFactory @Inject constructor(private val cryptoService: CryptoService,
-                                                      private val roomSummaryDataSource: RoomSummaryDataSource,
-                                                      private val timelineServiceFactory: DefaultTimelineService.Factory,
-                                                      private val threadsServiceFactory: DefaultThreadsService.Factory,
-                                                      private val threadsLocalServiceFactory: DefaultThreadsLocalService.Factory,
-                                                      private val sendServiceFactory: DefaultSendService.Factory,
-                                                      private val draftServiceFactory: DefaultDraftService.Factory,
-                                                      private val stateServiceFactory: DefaultStateService.Factory,
-                                                      private val uploadsServiceFactory: DefaultUploadsService.Factory,
-                                                      private val reportingServiceFactory: DefaultReportingService.Factory,
-                                                      private val roomCallServiceFactory: DefaultRoomCallService.Factory,
-                                                      private val readServiceFactory: DefaultReadService.Factory,
-                                                      private val typingServiceFactory: DefaultTypingService.Factory,
-                                                      private val aliasServiceFactory: DefaultAliasService.Factory,
-                                                      private val tagsServiceFactory: DefaultTagsService.Factory,
-                                                      private val relationServiceFactory: DefaultRelationService.Factory,
-                                                      private val membershipServiceFactory: DefaultMembershipService.Factory,
-                                                      private val roomPushRuleServiceFactory: DefaultRoomPushRuleService.Factory,
-                                                      private val roomVersionServiceFactory: DefaultRoomVersionService.Factory,
-                                                      private val roomAccountDataServiceFactory: DefaultRoomAccountDataService.Factory,
-                                                      private val sendStateTask: SendStateTask,
-                                                      private val viaParameterFinder: ViaParameterFinder,
-                                                      private val searchTask: SearchTask,
-                                                      private val coroutineDispatchers: MatrixCoroutineDispatchers) :
-        RoomFactory {
+internal class DefaultRoomFactory @Inject constructor(
+        private val roomSummaryDataSource: RoomSummaryDataSource,
+        private val timelineServiceFactory: DefaultTimelineService.Factory,
+        private val threadsServiceFactory: DefaultThreadsService.Factory,
+        private val threadsLocalServiceFactory: DefaultThreadsLocalService.Factory,
+        private val sendServiceFactory: DefaultSendService.Factory,
+        private val draftServiceFactory: DefaultDraftService.Factory,
+        private val stateServiceFactory: DefaultStateService.Factory,
+        private val uploadsServiceFactory: DefaultUploadsService.Factory,
+        private val reportingServiceFactory: DefaultReportingService.Factory,
+        private val roomCallServiceFactory: DefaultRoomCallService.Factory,
+        private val readServiceFactory: DefaultReadService.Factory,
+        private val typingServiceFactory: DefaultTypingService.Factory,
+        private val aliasServiceFactory: DefaultAliasService.Factory,
+        private val tagsServiceFactory: DefaultTagsService.Factory,
+        private val relationServiceFactory: DefaultRelationService.Factory,
+        private val roomCryptoServiceFactory: DefaultRoomCryptoService.Factory,
+        private val membershipServiceFactory: DefaultMembershipService.Factory,
+        private val roomPushRuleServiceFactory: DefaultRoomPushRuleService.Factory,
+        private val roomVersionServiceFactory: DefaultRoomVersionService.Factory,
+        private val roomAccountDataServiceFactory: DefaultRoomAccountDataService.Factory,
+        private val viaParameterFinder: ViaParameterFinder,
+        private val coroutineDispatchers: MatrixCoroutineDispatchers
+) : RoomFactory {
 
     override fun create(roomId: String): Room {
         return DefaultRoom(
                 roomId = roomId,
                 roomSummaryDataSource = roomSummaryDataSource,
+                roomCryptoService = roomCryptoServiceFactory.create(roomId),
                 timelineService = timelineServiceFactory.create(roomId),
                 threadsService = threadsServiceFactory.create(roomId),
                 threadsLocalService = threadsLocalServiceFactory.create(roomId),
@@ -92,14 +90,11 @@ internal class DefaultRoomFactory @Inject constructor(private val cryptoService:
                 typingService = typingServiceFactory.create(roomId),
                 aliasService = aliasServiceFactory.create(roomId),
                 tagsService = tagsServiceFactory.create(roomId),
-                cryptoService = cryptoService,
                 relationService = relationServiceFactory.create(roomId),
                 roomMembersService = membershipServiceFactory.create(roomId),
                 roomPushRuleService = roomPushRuleServiceFactory.create(roomId),
                 roomAccountDataService = roomAccountDataServiceFactory.create(roomId),
                 roomVersionService = roomVersionServiceFactory.create(roomId),
-                sendStateTask = sendStateTask,
-                searchTask = searchTask,
                 viaParameterFinder = viaParameterFinder,
                 coroutineDispatchers = coroutineDispatchers
         )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/DefaultLiveLocationAggregationProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/DefaultLiveLocationAggregationProcessor.kt
index 95e196c762..997e31a109 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/DefaultLiveLocationAggregationProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/DefaultLiveLocationAggregationProcessor.kt
@@ -17,69 +17,78 @@
 package org.matrix.android.sdk.internal.session.room.aggregation.livelocation
 
 import io.realm.Realm
-import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.extensions.orTrue
 import org.matrix.android.sdk.api.session.events.model.Event
-import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
-import org.matrix.android.sdk.api.session.room.model.livelocation.LiveLocationBeaconContent
-import org.matrix.android.sdk.api.session.room.model.message.MessageLiveLocationContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconInfoContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconLocationDataContent
 import org.matrix.android.sdk.internal.database.mapper.ContentMapper
-import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
-import org.matrix.android.sdk.internal.database.query.getOrNull
+import org.matrix.android.sdk.internal.database.model.livelocation.LiveLocationShareAggregatedSummaryEntity
+import org.matrix.android.sdk.internal.database.query.getOrCreate
 import timber.log.Timber
 import javax.inject.Inject
 
 internal class DefaultLiveLocationAggregationProcessor @Inject constructor() : LiveLocationAggregationProcessor {
 
-    override fun handleLiveLocation(realm: Realm, event: Event, content: MessageLiveLocationContent, roomId: String, isLocalEcho: Boolean) {
-        val locationSenderId = event.senderId ?: return
-
-        // We shouldn't process local echos
-        if (isLocalEcho) {
+    override fun handleBeaconInfo(realm: Realm, event: Event, content: MessageBeaconInfoContent, roomId: String, isLocalEcho: Boolean) {
+        if (event.senderId.isNullOrEmpty() || isLocalEcho) {
             return
         }
 
-        // A beacon info state event has to be sent before sending location
-        // TODO handle missing check of m_relatesTo field
-        var beaconInfoEntity: CurrentStateEventEntity? = null
-        val eventTypesIterator = EventType.STATE_ROOM_BEACON_INFO.iterator()
-        while (beaconInfoEntity == null && eventTypesIterator.hasNext()) {
-            beaconInfoEntity = CurrentStateEventEntity.getOrNull(realm, roomId, locationSenderId, eventTypesIterator.next())
-        }
-
-        if (beaconInfoEntity == null) {
-            Timber.v("## LIVE LOCATION. There is not any beacon info which should be emitted before sending location updates")
-            return
-        }
-        val beaconInfoContent = ContentMapper.map(beaconInfoEntity.root?.content)?.toModel<LiveLocationBeaconContent>(catchError = true)
-        if (beaconInfoContent == null) {
-            Timber.v("## LIVE LOCATION. Beacon info content is invalid")
-            return
-        }
-
-        // Check if live location is ended
-        if (!beaconInfoContent.getBestBeaconInfo()?.isLive.orFalse()) {
-            Timber.v("## LIVE LOCATION. Beacon info is not live anymore")
-            return
-        }
-
-        // Check if beacon info is outdated
-        if (isBeaconInfoOutdated(beaconInfoContent, content)) {
-            Timber.v("## LIVE LOCATION. Beacon info has timeout")
-            beaconInfoContent.hasTimedOut = true
+        val targetEventId = if (content.isLive.orTrue()) {
+            event.eventId
         } else {
-            beaconInfoContent.lastLocationContent = content
+            // when live is set to false, we use the id of the event that should have been replaced
+            event.unsignedData?.replacesState
         }
 
-        beaconInfoEntity.root?.content = ContentMapper.map(beaconInfoContent.toContent())
+        if (targetEventId.isNullOrEmpty()) {
+            Timber.w("no target event id found for the beacon content")
+            return
+        }
+
+        val aggregatedSummary = LiveLocationShareAggregatedSummaryEntity.getOrCreate(
+                realm = realm,
+                roomId = roomId,
+                eventId = targetEventId
+        )
+
+        Timber.d("updating summary of id=$targetEventId with isLive=${content.isLive}")
+
+        aggregatedSummary.endOfLiveTimestampMillis = content.getBestTimestampMillis()?.let { it + (content.timeout ?: 0) }
+        aggregatedSummary.isActive = content.isLive
     }
 
-    private fun isBeaconInfoOutdated(beaconInfoContent: LiveLocationBeaconContent,
-                                     liveLocationContent: MessageLiveLocationContent): Boolean {
-        val beaconInfoStartTime = beaconInfoContent.getBestTimestampAsMilliseconds() ?: 0
-        val liveLocationEventTime = liveLocationContent.getBestTimestampAsMilliseconds() ?: 0
-        val timeout = beaconInfoContent.getBestBeaconInfo()?.timeout ?: 0
-        return liveLocationEventTime - beaconInfoStartTime > timeout
+    override fun handleBeaconLocationData(realm: Realm, event: Event, content: MessageBeaconLocationDataContent, roomId: String, isLocalEcho: Boolean) {
+        if (event.senderId.isNullOrEmpty() || isLocalEcho) {
+            return
+        }
+
+        val targetEventId = content.relatesTo?.eventId
+
+        if (targetEventId.isNullOrEmpty()) {
+            Timber.w("no target event id found for the live location content")
+            return
+        }
+
+        val aggregatedSummary = LiveLocationShareAggregatedSummaryEntity.getOrCreate(
+                realm = realm,
+                roomId = roomId,
+                eventId = targetEventId
+        )
+        val updatedLocationTimestamp = content.getBestTimestampMillis() ?: 0
+        val currentLocationTimestamp = ContentMapper
+                .map(aggregatedSummary.lastLocationContent)
+                .toModel<MessageBeaconLocationDataContent>()
+                ?.getBestTimestampMillis()
+                ?: 0
+
+        if (updatedLocationTimestamp.isMoreRecentThan(currentLocationTimestamp)) {
+            Timber.d("updating last location of the summary of id=$targetEventId")
+            aggregatedSummary.lastLocationContent = ContentMapper.map(content.toContent())
+        }
     }
+
+    private fun Long.isMoreRecentThan(timestamp: Long) = this > timestamp
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/LiveLocationAggregationProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/LiveLocationAggregationProcessor.kt
index 7b5f23e243..c0be96f83d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/LiveLocationAggregationProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/LiveLocationAggregationProcessor.kt
@@ -18,12 +18,23 @@ package org.matrix.android.sdk.internal.session.room.aggregation.livelocation
 
 import io.realm.Realm
 import org.matrix.android.sdk.api.session.events.model.Event
-import org.matrix.android.sdk.api.session.room.model.message.MessageLiveLocationContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconInfoContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconLocationDataContent
 
 internal interface LiveLocationAggregationProcessor {
-    fun handleLiveLocation(realm: Realm,
-                           event: Event,
-                           content: MessageLiveLocationContent,
-                           roomId: String,
-                           isLocalEcho: Boolean)
+    fun handleBeaconInfo(
+            realm: Realm,
+            event: Event,
+            content: MessageBeaconInfoContent,
+            roomId: String,
+            isLocalEcho: Boolean,
+    )
+
+    fun handleBeaconLocationData(
+            realm: Realm,
+            event: Event,
+            content: MessageBeaconLocationDataContent,
+            roomId: String,
+            isLocalEcho: Boolean,
+    )
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomIdByAliasTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomIdByAliasTask.kt
index dc3ea55a01..b25ef7ba0f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomIdByAliasTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomIdByAliasTask.kt
@@ -52,7 +52,7 @@ internal class DefaultGetRoomIdByAliasTask @Inject constructor(
         } else if (!params.searchOnServer) {
             Optional.from(null)
         } else {
-            val description  = tryOrNull("## Failed to get roomId from alias") {
+            val description = tryOrNull("## Failed to get roomId from alias") {
                 executeRequest(globalErrorReceiver) {
                     directoryAPI.getRoomIdByAlias(params.roomAlias)
                 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
index 3b2e9d3d22..faf68d538f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
@@ -116,7 +116,8 @@ internal class CreateRoomBodyBuilder @Inject constructor(
                 fileUploader.uploadFromUri(
                         uri = avatarUri,
                         filename = UUID.randomUUID().toString(),
-                        mimeType = MimeTypes.Jpeg)
+                        mimeType = MimeTypes.Jpeg
+                )
             }
         }?.let { response ->
             Event(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt
index 9bd15a0267..6dd2c91048 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt
@@ -41,6 +41,7 @@ import org.matrix.android.sdk.internal.session.user.accountdata.DirectChatsHelpe
 import org.matrix.android.sdk.internal.session.user.accountdata.UpdateUserAccountDataTask
 import org.matrix.android.sdk.internal.task.Task
 import org.matrix.android.sdk.internal.util.awaitTransaction
+import org.matrix.android.sdk.internal.util.time.Clock
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
@@ -56,7 +57,8 @@ internal class DefaultCreateRoomTask @Inject constructor(
         @SessionDatabase
         private val realmConfiguration: RealmConfiguration,
         private val createRoomBodyBuilder: CreateRoomBodyBuilder,
-        private val globalErrorReceiver: GlobalErrorReceiver
+        private val globalErrorReceiver: GlobalErrorReceiver,
+        private val clock: Clock,
 ) : CreateRoomTask {
 
     override suspend fun execute(params: CreateRoomParams): String {
@@ -106,7 +108,7 @@ internal class DefaultCreateRoomTask @Inject constructor(
         }
 
         awaitTransaction(realmConfiguration) {
-            RoomSummaryEntity.where(it, roomId).findFirst()?.lastActivityTime = System.currentTimeMillis()
+            RoomSummaryEntity.where(it, roomId).findFirst()?.lastActivityTime = clock.epochMillis()
         }
 
         if (otherUserId != null) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/crypto/DefaultRoomCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/crypto/DefaultRoomCryptoService.kt
new file mode 100644
index 0000000000..2546c58cc7
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/crypto/DefaultRoomCryptoService.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.crypto
+
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import org.matrix.android.sdk.api.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.room.crypto.RoomCryptoService
+import org.matrix.android.sdk.api.util.awaitCallback
+import org.matrix.android.sdk.internal.session.room.state.SendStateTask
+import java.security.InvalidParameterException
+
+internal class DefaultRoomCryptoService @AssistedInject constructor(
+        @Assisted private val roomId: String,
+        private val cryptoService: CryptoService,
+        private val sendStateTask: SendStateTask,
+) : RoomCryptoService {
+
+    @AssistedFactory
+    interface Factory {
+        fun create(roomId: String): DefaultRoomCryptoService
+    }
+
+    override fun isEncrypted(): Boolean {
+        return cryptoService.isRoomEncrypted(roomId)
+    }
+
+    override fun encryptionAlgorithm(): String? {
+        return cryptoService.getEncryptionAlgorithm(roomId)
+    }
+
+    override fun shouldEncryptForInvitedMembers(): Boolean {
+        return cryptoService.shouldEncryptForInvitedMembers(roomId)
+    }
+
+    override suspend fun prepareToEncrypt() {
+        awaitCallback<Unit> {
+            cryptoService.prepareToEncrypt(roomId, it)
+        }
+    }
+
+    override suspend fun enableEncryption(algorithm: String, force: Boolean) {
+        when {
+            (!force && isEncrypted() && encryptionAlgorithm() == MXCRYPTO_ALGORITHM_MEGOLM) -> {
+                throw IllegalStateException("Encryption is already enabled for this room")
+            }
+            (!force && algorithm != MXCRYPTO_ALGORITHM_MEGOLM)                              -> {
+                throw InvalidParameterException("Only MXCRYPTO_ALGORITHM_MEGOLM algorithm is supported")
+            }
+            else                                                                            -> {
+                val params = SendStateTask.Params(
+                        roomId = roomId,
+                        stateKey = "",
+                        eventType = EventType.STATE_ROOM_ENCRYPTION,
+                        body = mapOf(
+                                "algorithm" to algorithm
+                        )
+                )
+
+                sendStateTask.execute(params)
+            }
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
index 70ba9287a2..d3d1cb856a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
@@ -42,6 +42,7 @@ import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryUpdater
 import org.matrix.android.sdk.internal.session.sync.SyncTokenStore
 import org.matrix.android.sdk.internal.task.Task
 import org.matrix.android.sdk.internal.util.awaitTransaction
+import org.matrix.android.sdk.internal.util.time.Clock
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
@@ -61,7 +62,8 @@ internal class DefaultLoadRoomMembersTask @Inject constructor(
         private val roomMemberEventHandler: RoomMemberEventHandler,
         private val cryptoSessionInfoProvider: CryptoSessionInfoProvider,
         private val deviceListManager: DeviceListManager,
-        private val globalErrorReceiver: GlobalErrorReceiver
+        private val globalErrorReceiver: GlobalErrorReceiver,
+        private val clock: Clock,
 ) : LoadRoomMembersTask {
 
     override suspend fun execute(params: LoadRoomMembersTask.Params) {
@@ -107,7 +109,7 @@ internal class DefaultLoadRoomMembersTask @Inject constructor(
             // We ignore all the already known members
             val roomEntity = RoomEntity.where(realm, roomId).findFirst()
                     ?: realm.createObject(roomId)
-            val now = System.currentTimeMillis()
+            val now = clock.epochMillis()
             for (roomMemberEvent in response.roomMemberEvents) {
                 if (roomMemberEvent.eventId == null || roomMemberEvent.stateKey == null || roomMemberEvent.type == null) {
                     continue
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
index 85300fa351..a1b30a0be5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
@@ -83,7 +83,8 @@ internal class RoomMemberEventHandler @Inject constructor(
                 roomMember,
                 // When an update is happening, insertOrUpdate replace existing values with null if they are not provided,
                 // but we want to preserve presence record value and not replace it with null
-                getExistingPresenceState(realm, roomId, userId))
+                getExistingPresenceState(realm, roomId, userId)
+        )
         realm.insertOrUpdate(roomMemberEntity)
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt
index f883cc33ec..6306f3c6fe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt
@@ -35,6 +35,7 @@ import org.matrix.android.sdk.internal.session.room.RoomAPI
 import org.matrix.android.sdk.internal.session.room.membership.RoomChangeMembershipStateDataSource
 import org.matrix.android.sdk.internal.session.room.read.SetReadMarkersTask
 import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.time.Clock
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
@@ -53,7 +54,8 @@ internal class DefaultJoinRoomTask @Inject constructor(
         @SessionDatabase
         private val realmConfiguration: RealmConfiguration,
         private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource,
-        private val globalErrorReceiver: GlobalErrorReceiver
+        private val globalErrorReceiver: GlobalErrorReceiver,
+        private val clock: Clock,
 ) : JoinRoomTask {
 
     override suspend fun execute(params: JoinRoomTask.Params) {
@@ -90,7 +92,7 @@ internal class DefaultJoinRoomTask @Inject constructor(
             throw JoinRoomFailure.JoinedWithTimeout
         }
         awaitTransaction(realmConfiguration) {
-            RoomSummaryEntity.where(it, roomId).findFirst()?.lastActivityTime = System.currentTimeMillis()
+            RoomSummaryEntity.where(it, roomId).findFirst()?.lastActivityTime = clock.epochMillis()
         }
         setReadMarkers(roomId)
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/DefaultRoomPushRuleService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/DefaultRoomPushRuleService.kt
index 8f1aefb731..85f53e1346 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/DefaultRoomPushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/DefaultRoomPushRuleService.kt
@@ -22,7 +22,7 @@ import com.zhuinden.monarchy.Monarchy
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import org.matrix.android.sdk.api.pushrules.RuleScope
+import org.matrix.android.sdk.api.session.pushrules.RuleScope
 import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
 import org.matrix.android.sdk.api.session.room.notification.RoomPushRuleService
 import org.matrix.android.sdk.internal.database.model.PushRuleEntity
@@ -32,7 +32,7 @@ import org.matrix.android.sdk.internal.di.SessionDatabase
 internal class DefaultRoomPushRuleService @AssistedInject constructor(@Assisted private val roomId: String,
                                                                       private val setRoomNotificationStateTask: SetRoomNotificationStateTask,
                                                                       @SessionDatabase private val monarchy: Monarchy) :
-    RoomPushRuleService {
+        RoomPushRuleService {
 
     @AssistedFactory
     interface Factory {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRule.kt
index d2c0d13b51..2c74e2a1e5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRule.kt
@@ -16,8 +16,8 @@
 
 package org.matrix.android.sdk.internal.session.room.notification
 
-import org.matrix.android.sdk.api.pushrules.RuleKind
-import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.session.pushrules.RuleKind
+import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
 
 internal data class RoomPushRule(
         val kind: RuleKind,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRuleMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRuleMapper.kt
index 86d2e6c619..a5a5ab58ba 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRuleMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRuleMapper.kt
@@ -16,13 +16,13 @@
 
 package org.matrix.android.sdk.internal.session.room.notification
 
-import org.matrix.android.sdk.api.pushrules.Action
-import org.matrix.android.sdk.api.pushrules.Kind
-import org.matrix.android.sdk.api.pushrules.RuleSetKey
-import org.matrix.android.sdk.api.pushrules.getActions
-import org.matrix.android.sdk.api.pushrules.rest.PushCondition
-import org.matrix.android.sdk.api.pushrules.rest.PushRule
-import org.matrix.android.sdk.api.pushrules.toJson
+import org.matrix.android.sdk.api.session.pushrules.Action
+import org.matrix.android.sdk.api.session.pushrules.Kind
+import org.matrix.android.sdk.api.session.pushrules.RuleSetKey
+import org.matrix.android.sdk.api.session.pushrules.getActions
+import org.matrix.android.sdk.api.session.pushrules.rest.PushCondition
+import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.session.pushrules.toJson
 import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
 import org.matrix.android.sdk.internal.database.mapper.PushRulesMapper
 import org.matrix.android.sdk.internal.database.model.PushRuleEntity
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/SetRoomNotificationStateTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/SetRoomNotificationStateTask.kt
index feb8c27b09..021d7dbefb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/SetRoomNotificationStateTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/SetRoomNotificationStateTask.kt
@@ -18,7 +18,7 @@ package org.matrix.android.sdk.internal.session.room.notification
 
 import com.zhuinden.monarchy.Monarchy
 import io.realm.Realm
-import org.matrix.android.sdk.api.pushrules.RuleScope
+import org.matrix.android.sdk.api.session.pushrules.RuleScope
 import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
 import org.matrix.android.sdk.internal.database.model.PushRuleEntity
 import org.matrix.android.sdk.internal.database.query.where
@@ -38,7 +38,7 @@ internal interface SetRoomNotificationStateTask : Task<SetRoomNotificationStateT
 internal class DefaultSetRoomNotificationStateTask @Inject constructor(@SessionDatabase private val monarchy: Monarchy,
                                                                        private val removePushRuleTask: RemovePushRuleTask,
                                                                        private val addPushRuleTask: AddPushRuleTask) :
-    SetRoomNotificationStateTask {
+        SetRoomNotificationStateTask {
 
     override suspend fun execute(params: SetRoomNotificationStateTask.Params) {
         val currentRoomPushRule = Realm.getInstance(monarchy.realmConfiguration).use {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/prune/RedactionEventProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/prune/RedactionEventProcessor.kt
index fe7dc28228..e926d6a785 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/prune/RedactionEventProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/prune/RedactionEventProcessor.kt
@@ -148,7 +148,8 @@ internal class RedactionEventProcessor @Inject constructor() : EventInsertLivePr
             EventType.STATE_ROOM_MEMBER          -> listOf("membership")
             EventType.STATE_ROOM_CREATE          -> listOf("creator")
             EventType.STATE_ROOM_JOIN_RULES      -> listOf("join_rule")
-            EventType.STATE_ROOM_POWER_LEVELS    -> listOf("users",
+            EventType.STATE_ROOM_POWER_LEVELS    -> listOf(
+                    "users",
                     "users_default",
                     "events",
                     "events_default",
@@ -156,7 +157,8 @@ internal class RedactionEventProcessor @Inject constructor() : EventInsertLivePr
                     "ban",
                     "kick",
                     "redact",
-                    "invite")
+                    "invite"
+            )
             EventType.STATE_ROOM_ALIASES         -> listOf("aliases")
             EventType.STATE_ROOM_CANONICAL_ALIAS -> listOf("alias")
             EventType.FEEDBACK                   -> listOf("type", "target_event_id")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
index 64f1cc34f1..a124a8a4c2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
@@ -34,6 +34,7 @@ import org.matrix.android.sdk.internal.session.sync.handler.room.ReadReceiptHand
 import org.matrix.android.sdk.internal.session.sync.handler.room.RoomFullyReadHandler
 import org.matrix.android.sdk.internal.task.Task
 import org.matrix.android.sdk.internal.util.awaitTransaction
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 import javax.inject.Inject
 import kotlin.collections.set
@@ -58,7 +59,8 @@ internal class DefaultSetReadMarkersTask @Inject constructor(
         private val roomFullyReadHandler: RoomFullyReadHandler,
         private val readReceiptHandler: ReadReceiptHandler,
         @UserId private val userId: String,
-        private val globalErrorReceiver: GlobalErrorReceiver
+        private val globalErrorReceiver: GlobalErrorReceiver,
+        private val clock: Clock,
 ) : SetReadMarkersTask {
 
     override suspend fun execute(params: SetReadMarkersTask.Params) {
@@ -125,7 +127,7 @@ internal class DefaultSetReadMarkersTask @Inject constructor(
                 roomFullyReadHandler.handle(realm, roomId, FullyReadContent(readMarkerId))
             }
             if (readReceiptId != null) {
-                val readReceiptContent = ReadReceiptHandler.createContent(userId, readReceiptId)
+                val readReceiptContent = ReadReceiptHandler.createContent(userId, readReceiptId, clock.epochMillis())
                 readReceiptHandler.handle(realm, roomId, readReceiptContent, false, null)
             }
             if (shouldUpdateRoomSummary) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
index ab514d31c8..7b68e2a74c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
@@ -131,7 +131,8 @@ internal class DefaultRelationService @AssistedInject constructor(
                 replyText = replyText,
                 autoMarkdown = autoMarkdown,
                 rootThreadEventId = rootThreadEventId,
-                showInThread = showInThread)
+                showInThread = showInThread
+        )
                 ?.also { saveLocalEcho(it) }
                 ?: return null
 
@@ -186,7 +187,8 @@ internal class DefaultRelationService @AssistedInject constructor(
                     text = replyInThreadText,
                     msgType = msgType,
                     autoMarkdown = autoMarkdown,
-                    formattedText = formattedText)
+                    formattedText = formattedText
+            )
                     .also {
                         saveLocalEcho(it)
                     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/EventEditor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/EventEditor.kt
index b54cd71e50..7bf7d6b587 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/EventEditor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/EventEditor.kt
@@ -27,12 +27,16 @@ import org.matrix.android.sdk.internal.database.mapper.toEntity
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoRepository
 import org.matrix.android.sdk.internal.session.room.send.queue.EventSenderProcessor
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 import javax.inject.Inject
 
-internal class EventEditor @Inject constructor(private val eventSenderProcessor: EventSenderProcessor,
-                                               private val eventFactory: LocalEchoEventFactory,
-                                               private val localEchoRepository: LocalEchoRepository) {
+internal class EventEditor @Inject constructor(
+        private val eventSenderProcessor: EventSenderProcessor,
+        private val eventFactory: LocalEchoEventFactory,
+        private val localEchoRepository: LocalEchoRepository,
+        private val clock: Clock,
+) {
 
     fun editTextMessage(targetEvent: TimelineEvent,
                         msgType: String,
@@ -126,7 +130,7 @@ internal class EventEditor @Inject constructor(private val eventSenderProcessor:
     }
 
     private fun updateFailedEchoWithEvent(roomId: String, failedEchoEventId: String, editedEvent: Event) {
-        val editedEventEntity = editedEvent.toEntity(roomId, SendState.UNSENT, System.currentTimeMillis())
+        val editedEventEntity = editedEvent.toEntity(roomId, SendState.UNSENT, clock.epochMillis())
         localEchoRepository.updateEchoAsync(failedEchoEventId) { _, entity ->
             entity.content = editedEventEntity.content
             entity.ageLocalTs = editedEventEntity.ageLocalTs
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadSummariesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadSummariesTask.kt
index b596f2288e..c5f9bd13fd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadSummariesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadSummariesTask.kt
@@ -33,6 +33,7 @@ import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection
 import org.matrix.android.sdk.internal.session.room.timeline.PaginationResponse
 import org.matrix.android.sdk.internal.task.Task
 import org.matrix.android.sdk.internal.util.awaitTransaction
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -55,12 +56,14 @@ internal class DefaultFetchThreadSummariesTask @Inject constructor(
         @SessionDatabase private val monarchy: Monarchy,
         private val cryptoService: DefaultCryptoService,
         @UserId private val userId: String,
+        private val clock: Clock,
 ) : FetchThreadSummariesTask {
 
     override suspend fun execute(params: FetchThreadSummariesTask.Params): Result {
         val filter = FilterFactory.createThreadsFilter(
                 numberOfEvents = params.limit,
-                userId = if (params.isUserParticipating) userId else null).toJSONString()
+                userId = if (params.isUserParticipating) userId else null
+        ).toJSONString()
 
         val response = executeRequest(
                 globalErrorReceiver,
@@ -94,7 +97,9 @@ internal class DefaultFetchThreadSummariesTask @Inject constructor(
                         roomMemberContentsByUser = roomMemberContentsByUser,
                         roomEntity = roomEntity,
                         userId = userId,
-                        cryptoService = cryptoService)
+                        cryptoService = cryptoService,
+                        currentTimeMillis = clock.epochMillis(),
+                )
             }
         }
         return Result.SUCCESS
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt
index 116d4aa0a1..8d35a8fea4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt
@@ -23,7 +23,6 @@ import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
 import org.matrix.android.sdk.api.session.room.send.SendState
-import org.matrix.android.sdk.internal.crypto.CryptoSessionInfoProvider
 import org.matrix.android.sdk.internal.crypto.DefaultCryptoService
 import org.matrix.android.sdk.internal.database.helper.addTimelineEvent
 import org.matrix.android.sdk.internal.database.mapper.asDomain
@@ -42,7 +41,6 @@ import org.matrix.android.sdk.internal.database.query.getOrCreate
 import org.matrix.android.sdk.internal.database.query.getOrNull
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
-import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.events.getFixedRoomMemberContent
@@ -51,6 +49,7 @@ import org.matrix.android.sdk.internal.session.room.relation.RelationsResponse
 import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection
 import org.matrix.android.sdk.internal.task.Task
 import org.matrix.android.sdk.internal.util.awaitTransaction
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -85,10 +84,9 @@ internal interface FetchThreadTimelineTask : Task<FetchThreadTimelineTask.Params
 internal class DefaultFetchThreadTimelineTask @Inject constructor(
         private val roomAPI: RoomAPI,
         private val globalErrorReceiver: GlobalErrorReceiver,
-        private val cryptoSessionInfoProvider: CryptoSessionInfoProvider,
         @SessionDatabase private val monarchy: Monarchy,
-        @UserId private val userId: String,
-        private val cryptoService: DefaultCryptoService
+        private val cryptoService: DefaultCryptoService,
+        private val clock: Clock,
 ) : FetchThreadTimelineTask {
 
     enum class Result {
@@ -156,7 +154,8 @@ internal class DefaultFetchThreadTimelineTask @Inject constructor(
                             eventEntity = eventEntity,
                             direction = PaginationDirection.FORWARDS,
                             ownedByThreadChunk = true,
-                            roomMemberContentsByUser = roomMemberContentsByUser)
+                            roomMemberContentsByUser = roomMemberContentsByUser
+                    )
                 }
             }
 
@@ -178,7 +177,8 @@ internal class DefaultFetchThreadTimelineTask @Inject constructor(
                             eventEntity = eventEntity,
                             direction = PaginationDirection.FORWARDS,
                             ownedByThreadChunk = true,
-                            roomMemberContentsByUser = roomMemberContentsByUser)
+                            roomMemberContentsByUser = roomMemberContentsByUser
+                    )
                 }
             }
         }
@@ -207,7 +207,7 @@ internal class DefaultFetchThreadTimelineTask @Inject constructor(
      * Create an EventEntity to be added in the TimelineEventEntity
      */
     private fun createEventEntity(roomId: String, event: Event, realm: Realm): EventEntity {
-        val ageLocalTs = event.unsignedData?.age?.let { System.currentTimeMillis() - it }
+        val ageLocalTs = event.unsignedData?.age?.let { clock.epochMillis() - it }
         return event.toEntity(roomId, SendState.SYNCED, ageLocalTs).copyToRealmOrIgnore(realm, EventInsertType.PAGINATION)
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
index 34e38581d1..9baaa9cd82 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
@@ -275,7 +275,8 @@ internal class DefaultSendService @AssistedInject constructor(
                     attachment = it,
                     compressBeforeSending = compressBeforeSending,
                     roomIds = roomIds,
-                    rootThreadEventId = rootThreadEventId)
+                    rootThreadEventId = rootThreadEventId
+            )
         }
     }
 
@@ -297,7 +298,8 @@ internal class DefaultSendService @AssistedInject constructor(
             localEchoEventFactory.createMediaEvent(
                     roomId = it,
                     attachment = attachment,
-                    rootThreadEventId = rootThreadId).also { event ->
+                    rootThreadEventId = rootThreadId
+            ).also { event ->
                 createLocalEcho(event)
             }
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
index bb16563f96..d019ffada6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
@@ -37,13 +37,13 @@ import org.matrix.android.sdk.api.session.room.model.message.LocationAsset
 import org.matrix.android.sdk.api.session.room.model.message.LocationAssetType
 import org.matrix.android.sdk.api.session.room.model.message.LocationInfo
 import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconLocationDataContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageContentWithFormattedBody
 import org.matrix.android.sdk.api.session.room.model.message.MessageEndPollContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageFileContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageFormat
 import org.matrix.android.sdk.api.session.room.model.message.MessageImageContent
-import org.matrix.android.sdk.api.session.room.model.message.MessageLiveLocationContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageLocationContent
 import org.matrix.android.sdk.api.session.room.model.message.MessagePollContent
 import org.matrix.android.sdk.api.session.room.model.message.MessagePollResponseContent
@@ -70,8 +70,8 @@ import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.content.ThumbnailExtractor
 import org.matrix.android.sdk.internal.session.permalinks.PermalinkFactory
 import org.matrix.android.sdk.internal.session.room.send.pills.TextPillsUtils
+import org.matrix.android.sdk.internal.util.time.Clock
 import java.util.UUID
-import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 /**
@@ -91,7 +91,8 @@ internal class LocalEchoEventFactory @Inject constructor(
         private val thumbnailExtractor: ThumbnailExtractor,
         private val waveformSanitizer: WaveFormSanitizer,
         private val localEchoRepository: LocalEchoRepository,
-        private val permalinkFactory: PermalinkFactory
+        private val permalinkFactory: PermalinkFactory,
+        private val clock: Clock,
 ) {
     fun createTextEvent(roomId: String, msgType: String, text: CharSequence, autoMarkdown: Boolean): Event {
         if (msgType == MessageType.MSGTYPE_TEXT || msgType == MessageType.MSGTYPE_EMOTE) {
@@ -124,7 +125,8 @@ internal class LocalEchoEventFactory @Inject constructor(
                                newBodyAutoMarkdown: Boolean,
                                msgType: String,
                                compatibilityText: String): Event {
-        return createMessageEvent(roomId,
+        return createMessageEvent(
+                roomId,
                 MessageTextContent(
                         msgType = msgType,
                         body = compatibilityText,
@@ -132,7 +134,8 @@ internal class LocalEchoEventFactory @Inject constructor(
                         newContent = createTextContent(newBodyText, newBodyAutoMarkdown)
                                 .toMessageTextContent(msgType)
                                 .toContent()
-                ))
+                )
+        )
     }
 
     private fun createPollContent(question: String,
@@ -188,7 +191,8 @@ internal class LocalEchoEventFactory @Inject constructor(
                 eventId = localId,
                 type = EventType.POLL_RESPONSE.first(),
                 content = content.toContent(),
-                unsignedData = UnsignedData(age = null, transactionId = localId))
+                unsignedData = UnsignedData(age = null, transactionId = localId)
+        )
     }
 
     fun createPollEvent(roomId: String,
@@ -204,7 +208,8 @@ internal class LocalEchoEventFactory @Inject constructor(
                 eventId = localId,
                 type = EventType.POLL_START.first(),
                 content = content.toContent(),
-                unsignedData = UnsignedData(age = null, transactionId = localId))
+                unsignedData = UnsignedData(age = null, transactionId = localId)
+        )
     }
 
     fun createEndPollEvent(roomId: String,
@@ -223,7 +228,8 @@ internal class LocalEchoEventFactory @Inject constructor(
                 eventId = localId,
                 type = EventType.POLL_END.first(),
                 content = content.toContent(),
-                unsignedData = UnsignedData(age = null, transactionId = localId))
+                unsignedData = UnsignedData(age = null, transactionId = localId)
+        )
     }
 
     fun createLocationEvent(roomId: String,
@@ -238,7 +244,7 @@ internal class LocalEchoEventFactory @Inject constructor(
                 body = geoUri,
                 unstableLocationInfo = LocationInfo(geoUri = geoUri, description = geoUri),
                 unstableLocationAsset = LocationAsset(type = assetType),
-                unstableTs = TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()),
+                unstableTimestampMillis = clock.epochMillis(),
                 unstableText = geoUri
         )
         return createMessageEvent(roomId, content)
@@ -250,14 +256,14 @@ internal class LocalEchoEventFactory @Inject constructor(
                                 longitude: Double,
                                 uncertainty: Double?): Event {
         val geoUri = buildGeoUri(latitude, longitude, uncertainty)
-        val content = MessageLiveLocationContent(
+        val content = MessageBeaconLocationDataContent(
                 body = geoUri,
                 relatesTo = RelationDefaultContent(
                         type = RelationType.REFERENCE,
                         eventId = beaconInfoEventId
                 ),
                 unstableLocationInfo = LocationInfo(geoUri = geoUri, description = geoUri),
-                unstableTimestampAsMilliseconds = TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()),
+                unstableTimestampMillis = clock.epochMillis(),
         )
         val localId = LocalEcho.createLocalEchoId()
         return Event(
@@ -267,7 +273,8 @@ internal class LocalEchoEventFactory @Inject constructor(
                 eventId = localId,
                 type = EventType.BEACON_LOCATION_DATA.first(),
                 content = content.toContent(),
-                unsignedData = UnsignedData(age = null, transactionId = localId))
+                unsignedData = UnsignedData(age = null, transactionId = localId)
+        )
     }
 
     fun createReplaceTextOfReply(roomId: String,
@@ -297,7 +304,8 @@ internal class LocalEchoEventFactory @Inject constructor(
         //
         val replyFallback = buildReplyFallback(body, originalEvent.root.senderId ?: "", newBodyText)
 
-        return createMessageEvent(roomId,
+        return createMessageEvent(
+                roomId,
                 MessageTextContent(
                         msgType = msgType,
                         body = compatibilityText,
@@ -309,7 +317,8 @@ internal class LocalEchoEventFactory @Inject constructor(
                                 formattedBody = replyFormatted
                         )
                                 .toContent()
-                ))
+                )
+        )
     }
 
     fun createMediaEvent(roomId: String,
@@ -341,7 +350,8 @@ internal class LocalEchoEventFactory @Inject constructor(
                 eventId = localId,
                 type = EventType.REACTION,
                 content = content.toContent(),
-                unsignedData = UnsignedData(age = null, transactionId = localId))
+                unsignedData = UnsignedData(age = null, transactionId = localId)
+        )
     }
 
     private fun createImageEvent(roomId: String, attachment: ContentAttachmentData, rootThreadEventId: String?): Event {
@@ -532,12 +542,14 @@ internal class LocalEchoEventFactory @Inject constructor(
                 content.toThreadTextContent(
                         rootThreadEventId = rootThreadEventId,
                         latestThreadEventId = localEchoRepository.getLatestThreadEvent(rootThreadEventId),
-                        msgType = msgType)
-                        .toContent())
+                        msgType = msgType
+                )
+                        .toContent()
+        )
     }
 
     private fun dummyOriginServerTs(): Long {
-        return System.currentTimeMillis()
+        return clock.epochMillis()
     }
 
     /**
@@ -582,7 +594,9 @@ internal class LocalEchoEventFactory @Inject constructor(
                 relatesTo = generateReplyRelationContent(
                         eventId = eventId,
                         rootThreadEventId = rootThreadEventId,
-                        showInThread = showInThread))
+                        showInThread = showInThread
+                )
+        )
         return createMessageEvent(roomId, content)
     }
 
@@ -605,7 +619,8 @@ internal class LocalEchoEventFactory @Inject constructor(
                         eventId = it,
                         isFallingBack = showInThread,
                         // False when is a rich reply from within a thread, and true when is a reply that should be visible from threads
-                        inReplyTo = ReplyToContent(eventId = eventId))
+                        inReplyTo = ReplyToContent(eventId = eventId)
+                )
             } ?: RelationDefaultContent(null, null, ReplyToContent(eventId = eventId))
 
     private fun buildFormattedReply(permalink: String, userLink: String, userId: String, bodyFormatted: String, newBodyFormatted: String): String {
@@ -740,13 +755,15 @@ internal class LocalEchoEventFactory @Inject constructor(
                             .toThreadTextContent(
                                     rootThreadEventId = rootThreadEventId,
                                     latestThreadEventId = localEchoRepository.getLatestThreadEvent(rootThreadEventId),
-                                    msgType = MessageType.MSGTYPE_TEXT)
+                                    msgType = MessageType.MSGTYPE_TEXT
+                            )
             )
         } else {
             createFormattedTextEvent(
                     roomId,
                     markdownParser.parse(quoteText, force = true, advanced = autoMarkdown),
-                    MessageType.MSGTYPE_TEXT)
+                    MessageType.MSGTYPE_TEXT
+            )
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt
index 1b1a66a1c4..9fd45b917f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt
@@ -43,16 +43,20 @@ import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryUpdater
 import org.matrix.android.sdk.internal.session.room.timeline.TimelineInput
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.util.awaitTransaction
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 import java.util.UUID
 import javax.inject.Inject
 
-internal class LocalEchoRepository @Inject constructor(@SessionDatabase private val monarchy: Monarchy,
-                                                       private val taskExecutor: TaskExecutor,
-                                                       private val realmSessionProvider: RealmSessionProvider,
-                                                       private val roomSummaryUpdater: RoomSummaryUpdater,
-                                                       private val timelineInput: TimelineInput,
-                                                       private val timelineEventMapper: TimelineEventMapper) {
+internal class LocalEchoRepository @Inject constructor(
+        @SessionDatabase private val monarchy: Monarchy,
+        private val taskExecutor: TaskExecutor,
+        private val realmSessionProvider: RealmSessionProvider,
+        private val roomSummaryUpdater: RoomSummaryUpdater,
+        private val timelineInput: TimelineInput,
+        private val timelineEventMapper: TimelineEventMapper,
+        private val clock: Clock,
+) {
 
     fun createLocalEcho(event: Event) {
         val roomId = event.roomId ?: throw IllegalStateException("You should have set a roomId for your event")
@@ -61,7 +65,7 @@ internal class LocalEchoRepository @Inject constructor(@SessionDatabase private
         event.type ?: throw IllegalStateException("You should have set a type for your event")
 
         val timelineEventEntity = realmSessionProvider.withRealm { realm ->
-            val eventEntity = event.toEntity(roomId, SendState.UNSENT, System.currentTimeMillis())
+            val eventEntity = event.toEntity(roomId, SendState.UNSENT, clock.epochMillis())
             val roomMemberHelper = RoomMemberHelper(realm, roomId)
             val myUser = roomMemberHelper.getLastRoomMember(senderId)
             val localId = UUID.randomUUID().mostSignificantBits
@@ -88,7 +92,7 @@ internal class LocalEchoRepository @Inject constructor(@SessionDatabase private
     }
 
     fun updateSendState(eventId: String, roomId: String?, sendState: SendState, sendStateDetails: String? = null) {
-        Timber.v("## SendEvent: [${System.currentTimeMillis()}] Update local state of $eventId to ${sendState.name}")
+        Timber.v("## SendEvent: [${clock.epochMillis()}] Update local state of $eventId to ${sendState.name}")
         timelineInput.onLocalEchoUpdated(roomId = roomId ?: "", eventId = eventId, sendState = sendState)
         updateEchoAsync(eventId) { realm, sendingEventEntity ->
             if (sendState == SendState.SENT && sendingEventEntity.sendState == SendState.SYNCED) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt
index b59f1b174f..ecc8149255 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt
@@ -39,7 +39,7 @@ import javax.inject.Inject
  * Possible next worker    : None, but it will post new work to send events, encrypted or not
  */
 internal class MultipleEventSendingDispatcherWorker(context: Context, params: WorkerParameters, sessionManager: SessionManager) :
-    SessionSafeCoroutineWorker<MultipleEventSendingDispatcherWorker.Params>(context, params, sessionManager, Params::class.java) {
+        SessionSafeCoroutineWorker<MultipleEventSendingDispatcherWorker.Params>(context, params, sessionManager, Params::class.java) {
 
     @JsonClass(generateAdapter = true)
     internal data class Params(
@@ -76,10 +76,10 @@ internal class MultipleEventSendingDispatcherWorker(context: Context, params: Wo
         params.localEchoIds.forEach { localEchoIds ->
             val roomId = localEchoIds.roomId
             val eventId = localEchoIds.eventId
-                localEchoRepository.updateSendState(eventId, roomId, SendState.SENDING)
-                Timber.v("## SendEvent: [${System.currentTimeMillis()}] Schedule send event $eventId")
-                val sendWork = createSendEventWork(params.sessionId, eventId, true)
-                timelineSendEventWorkCommon.postWork(roomId, sendWork)
+            localEchoRepository.updateSendState(eventId, roomId, SendState.SENDING)
+            Timber.v("## SendEvent: Schedule send event $eventId")
+            val sendWork = createSendEventWork(params.sessionId, eventId, true)
+            timelineSendEventWorkCommon.postWork(roomId, sendWork)
         }
 
         return Result.success()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt
index c03d1fa81e..db8d1b5674 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt
@@ -34,7 +34,7 @@ import javax.inject.Inject
  * Possible next worker    : None
  */
 internal class RedactEventWorker(context: Context, params: WorkerParameters, sessionManager: SessionManager) :
-    SessionSafeCoroutineWorker<RedactEventWorker.Params>(context, params, sessionManager, Params::class.java) {
+        SessionSafeCoroutineWorker<RedactEventWorker.Params>(context, params, sessionManager, Params::class.java) {
 
     @JsonClass(generateAdapter = true)
     internal data class Params(
@@ -74,9 +74,13 @@ internal class RedactEventWorker(context: Context, params: WorkerParameters, ses
                         else                         -> {
                             // TODO mark as failed to send?
                             // always return success, or the chain will be stuck for ever!
-                            Result.success(WorkerParamsFactory.toData(params.copy(
-                                    lastFailureMessage = it.localizedMessage
-                            )))
+                            Result.success(
+                                    WorkerParamsFactory.toData(
+                                            params.copy(
+                                                    lastFailureMessage = it.localizedMessage
+                                            )
+                                    )
+                            )
                         }
                     }
                 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt
index 7f24688ece..ddbe8a61a0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt
@@ -40,7 +40,7 @@ import javax.inject.Inject
  * Possible next worker    : None
  */
 internal class SendEventWorker(context: Context, params: WorkerParameters, sessionManager: SessionManager) :
-    SessionSafeCoroutineWorker<SendEventWorker.Params>(context, params, sessionManager, Params::class.java) {
+        SessionSafeCoroutineWorker<SendEventWorker.Params>(context, params, sessionManager, Params::class.java) {
 
     @JsonClass(generateAdapter = true)
     internal data class Params(
@@ -89,13 +89,13 @@ internal class SendEventWorker(context: Context, params: WorkerParameters, sessi
                     .also { Timber.e("Work cancelled due to input error from parent") }
         }
 
-        Timber.v("## SendEvent: [${System.currentTimeMillis()}] Send event ${params.eventId}")
+        Timber.v("## SendEvent: Send event ${params.eventId}")
         return try {
             sendEventTask.execute(SendEventTask.Params(event, params.isEncrypted ?: cryptoService.isRoomEncrypted(event.roomId)))
             Result.success()
         } catch (exception: Throwable) {
             if (/*currentAttemptCount >= MAX_NUMBER_OF_RETRY_BEFORE_FAILING ||**/ !exception.shouldBeRetried()) {
-                Timber.e("## SendEvent: [${System.currentTimeMillis()}]  Send event Failed cannot retry ${params.eventId} > ${exception.localizedMessage}")
+                Timber.e("## SendEvent: Send event Failed cannot retry ${params.eventId} > ${exception.localizedMessage}")
                 localEchoRepository.updateSendState(
                         eventId = event.eventId,
                         roomId = event.roomId,
@@ -104,7 +104,7 @@ internal class SendEventWorker(context: Context, params: WorkerParameters, sessi
                 )
                 Result.success()
             } else {
-                Timber.e("## SendEvent: [${System.currentTimeMillis()}]  Send event Failed schedule retry ${params.eventId} > ${exception.localizedMessage}")
+                Timber.e("## SendEvent: Send event Failed schedule retry ${params.eventId} > ${exception.localizedMessage}")
                 Result.retry()
             }
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/TextContentExtension.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/TextContentExtension.kt
index 8caa99d90a..49bc05f40c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/TextContentExtension.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/TextContentExtension.kt
@@ -54,7 +54,8 @@ internal fun TextContent.toThreadTextContent(
                     isFallingBack = true,
                     inReplyTo = ReplyToContent(
                             eventId = latestThreadEventId
-                    )),
+                    )
+            ),
             formattedBody = formattedText
     )
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
index 5b4efa5df6..a1d3e2c0ac 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
@@ -191,7 +191,7 @@ internal class EventSenderProcessorCoroutine @Inject constructor(
 
     private suspend fun QueuedTask.waitForNetwork() = waitForNetworkSequencer.post {
         while (!canReachServer.get()) {
-            Timber.v("## $this cannot reach server wait ts:${System.currentTimeMillis()}")
+            Timber.v("## $this cannot reach server wait for $$RETRY_WAIT_TIME_MS ms")
             delay(RETRY_WAIT_TIME_MS)
             withContext(Dispatchers.IO) {
                 val hostAvailable = HomeServerAvailabilityChecker(sessionParams).check()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt
index 1ee3139194..301f8cb9d6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt
@@ -136,7 +136,7 @@ internal class EventSenderProcessorThread @Inject constructor(
     private var retryNoNetworkTask: TimerTask? = null
 
     override fun run() {
-        Timber.v("## SendThread started ts:${System.currentTimeMillis()}")
+        Timber.v("## SendThread started")
         try {
             while (!isInterrupted) {
                 Timber.v("## SendThread wait for task to process")
@@ -151,7 +151,7 @@ internal class EventSenderProcessorThread @Inject constructor(
                 }
                 // we check for network connectivity
                 while (!canReachServer) {
-                    Timber.v("## SendThread cannot reach server, wait ts:${System.currentTimeMillis()}")
+                    Timber.v("## SendThread cannot reach server")
                     // schedule to retry
                     waitForNetwork()
                     // if thread as been killed meanwhile
@@ -175,7 +175,7 @@ internal class EventSenderProcessorThread @Inject constructor(
                                     canReachServer = false
                                     if (task.retryCount.getAndIncrement() >= 3) task.onTaskFailed()
                                     while (!canReachServer) {
-                                        Timber.v("## SendThread retryLoop cannot reach server, wait ts:${System.currentTimeMillis()}")
+                                        Timber.v("## SendThread retryLoop cannot reach server")
                                         // schedule to retry
                                         waitForNetwork()
                                     }
@@ -218,7 +218,7 @@ internal class EventSenderProcessorThread @Inject constructor(
 //        state = State.KILLED
         // is this needed?
         retryNoNetworkTask?.cancel()
-        Timber.w("## SendThread finished ${System.currentTimeMillis()}")
+        Timber.w("## SendThread finished")
     }
 
     private fun waitForNetwork() {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueueMemento.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueueMemento.kt
index 116c8d5c6b..545fc41737 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueueMemento.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueueMemento.kt
@@ -74,7 +74,7 @@ internal class QueueMemento @Inject constructor(context: Context,
                     encrypt = task.encrypt,
                     order = order
             )
-            is RedactQueuedTask -> RedactEventTaskInfo(
+            is RedactQueuedTask    -> RedactEventTaskInfo(
                     redactionLocalEcho = task.redactionLocalEchoId,
                     order = order
             )
@@ -92,7 +92,7 @@ internal class QueueMemento @Inject constructor(context: Context,
                 ?.forEach { info ->
                     try {
                         when (info) {
-                            is SendEventTaskInfo -> {
+                            is SendEventTaskInfo   -> {
                                 localEchoRepository.getUpToDateEcho(info.localEchoId)?.let {
                                     if (it.sendState.isSending() && it.eventId != null && it.roomId != null) {
                                         localEchoRepository.updateSendState(it.eventId, it.roomId, SendState.UNSENT)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/TaskInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/TaskInfo.kt
index a03ab778f6..a7863470f7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/TaskInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/TaskInfo.kt
@@ -37,9 +37,10 @@ internal interface TaskInfo {
         const val TYPE_REDACT = "TYPE_REDACT"
 
         private val moshi = Moshi.Builder()
-                .add(RuntimeJsonAdapterFactory.of(TaskInfo::class.java, "type", FallbackTaskInfo::class.java)
-                        .registerSubtype(SendEventTaskInfo::class.java, TYPE_SEND)
-                        .registerSubtype(RedactEventTaskInfo::class.java, TYPE_REDACT)
+                .add(
+                        RuntimeJsonAdapterFactory.of(TaskInfo::class.java, "type", FallbackTaskInfo::class.java)
+                                .registerSubtype(SendEventTaskInfo::class.java, TYPE_SEND)
+                                .registerSubtype(RedactEventTaskInfo::class.java, TYPE_REDACT)
                 )
                 .add(SerializeNulls.JSON_ADAPTER_FACTORY)
                 .build()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
index 89d33f98d2..e5c7a75cb6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
@@ -33,8 +33,7 @@ import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesAllowEntry
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesContent
-import org.matrix.android.sdk.api.session.room.model.livelocation.BeaconInfo
-import org.matrix.android.sdk.api.session.room.model.livelocation.LiveLocationBeaconContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconInfoContent
 import org.matrix.android.sdk.api.session.room.state.StateService
 import org.matrix.android.sdk.api.util.JsonDict
 import org.matrix.android.sdk.api.util.MimeTypes
@@ -74,14 +73,14 @@ internal class DefaultStateService @AssistedInject constructor(@Assisted private
             eventType: String,
             stateKey: String,
             body: JsonDict
-    ) {
+    ): String {
         val params = SendStateTask.Params(
                 roomId = roomId,
                 stateKey = stateKey,
                 eventType = eventType,
                 body = body.toSafeJson(eventType)
         )
-        sendStateTask.executeRetry(params, 3)
+        return sendStateTask.executeRetry(params, 3)
     }
 
     private fun JsonDict.toSafeJson(eventType: String): JsonDict {
@@ -193,20 +192,13 @@ internal class DefaultStateService @AssistedInject constructor(@Assisted private
 
     override suspend fun stopLiveLocation(userId: String) {
         getLiveLocationBeaconInfo(userId, true)?.let { beaconInfoStateEvent ->
-            beaconInfoStateEvent.getClearContent()?.toModel<LiveLocationBeaconContent>()?.let { content ->
-                val beaconContent = LiveLocationBeaconContent(
-                        unstableBeaconInfo = BeaconInfo(
-                                description = content.getBestBeaconInfo()?.description,
-                                timeout = content.getBestBeaconInfo()?.timeout,
-                                isLive = false,
-                        ),
-                        unstableTimestampAsMilliseconds = System.currentTimeMillis()
-                ).toContent()
+            beaconInfoStateEvent.getClearContent()?.toModel<MessageBeaconInfoContent>()?.let { content ->
+                val updatedContent = content.copy(isLive = false).toContent()
 
                 beaconInfoStateEvent.stateKey?.let {
                     sendStateEvent(
                             eventType = EventType.STATE_ROOM_BEACON_INFO.first(),
-                            body = beaconContent,
+                            body = updatedContent,
                             stateKey = it
                     )
                 }
@@ -225,7 +217,7 @@ internal class DefaultStateService @AssistedInject constructor(@Assisted private
                 }
                 .firstOrNull { beaconInfoEvent ->
                     !filterOnlyLive ||
-                            beaconInfoEvent.getClearContent()?.toModel<LiveLocationBeaconContent>()?.getBestBeaconInfo()?.isLive.orFalse()
+                            beaconInfoEvent.getClearContent()?.toModel<MessageBeaconInfoContent>()?.isLive.orFalse()
                 }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SafePowerLevelContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SafePowerLevelContent.kt
index 197b4f8688..1f2ec09367 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SafePowerLevelContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SafePowerLevelContent.kt
@@ -51,7 +51,7 @@ internal fun JsonDict.toSafePowerLevelsContentDict(): JsonDict {
                         usersDefault = content.usersDefault,
                         users = content.users,
                         stateDefault = content.stateDefault,
-                        notifications = content.notifications?.mapValues { content.notificationLevel(it.key)  }
+                        notifications = content.notifications?.mapValues { content.notificationLevel(it.key) }
                 )
             }
             ?.toContent()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt
index 56c69a05a6..59c9de2932 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt
@@ -21,9 +21,10 @@ import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.room.RoomAPI
 import org.matrix.android.sdk.internal.task.Task
+import timber.log.Timber
 import javax.inject.Inject
 
-internal interface SendStateTask : Task<SendStateTask.Params, Unit> {
+internal interface SendStateTask : Task<SendStateTask.Params, String> {
     data class Params(
             val roomId: String,
             val stateKey: String,
@@ -37,9 +38,9 @@ internal class DefaultSendStateTask @Inject constructor(
         private val globalErrorReceiver: GlobalErrorReceiver
 ) : SendStateTask {
 
-    override suspend fun execute(params: SendStateTask.Params) {
+    override suspend fun execute(params: SendStateTask.Params): String {
         return executeRequest(globalErrorReceiver) {
-            if (params.stateKey.isEmpty()) {
+            val response = if (params.stateKey.isEmpty()) {
                 roomAPI.sendStateEvent(
                         roomId = params.roomId,
                         stateEventType = params.eventType,
@@ -53,6 +54,9 @@ internal class DefaultSendStateTask @Inject constructor(
                         params = params.body
                 )
             }
+            response.eventId.also {
+                Timber.d("State event: $it just sent in room ${params.roomId}")
+            }
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/GraphUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/GraphUtils.kt
index e3a215445d..52879d7121 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/GraphUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/GraphUtils.kt
@@ -101,11 +101,11 @@ internal class Graph {
                         // it's a candidate
                         destination = it.destination
                     }
-                    inPath -> {
+                    inPath     -> {
                         // Cycle!!
                         backwardEdges.add(it)
                     }
-                    completed -> {
+                    completed  -> {
                         // dead end
                     }
                 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index 18a4f80547..96e8d3c73f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -26,7 +26,6 @@ import com.zhuinden.monarchy.Monarchy
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.kotlin.where
-import org.matrix.android.sdk.api.MatrixCoroutineDispatchers
 import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.query.isNormalized
@@ -43,7 +42,6 @@ import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotification
 import org.matrix.android.sdk.api.session.space.SpaceSummaryQueryParams
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toOptional
-import org.matrix.android.sdk.internal.database.RealmSessionProvider
 import org.matrix.android.sdk.internal.database.mapper.RoomSummaryMapper
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
@@ -57,10 +55,8 @@ import javax.inject.Inject
 
 internal class RoomSummaryDataSource @Inject constructor(
         @SessionDatabase private val monarchy: Monarchy,
-        private val realmSessionProvider: RealmSessionProvider,
         private val roomSummaryMapper: RoomSummaryMapper,
         private val queryStringValueProcessor: QueryStringValueProcessor,
-        private val coroutineDispatchers: MatrixCoroutineDispatchers
 ) {
 
     fun getRoomSummary(roomIdOrAlias: String): RoomSummary? {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/threads/DefaultThreadsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/threads/DefaultThreadsService.kt
index b65991347d..6c6d6368d1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/threads/DefaultThreadsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/threads/DefaultThreadsService.kt
@@ -72,17 +72,21 @@ internal class DefaultThreadsService @AssistedInject constructor(
     }
 
     override suspend fun fetchThreadTimeline(rootThreadEventId: String, from: String, limit: Int) {
-        fetchThreadTimelineTask.execute(FetchThreadTimelineTask.Params(
-                roomId = roomId,
-                rootThreadEventId = rootThreadEventId,
-                from = from,
-                limit = limit
-        ))
+        fetchThreadTimelineTask.execute(
+                FetchThreadTimelineTask.Params(
+                        roomId = roomId,
+                        rootThreadEventId = rootThreadEventId,
+                        from = from,
+                        limit = limit
+                )
+        )
     }
 
     override suspend fun fetchThreadSummaries() {
-        fetchThreadSummariesTask.execute(FetchThreadSummariesTask.Params(
-                roomId = roomId
-        ))
+        fetchThreadSummariesTask.execute(
+                FetchThreadSummariesTask.Params(
+                        roomId = roomId
+                )
+        )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/threads/local/DefaultThreadsLocalService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/threads/local/DefaultThreadsLocalService.kt
index 3bc36fb2a8..296981dfc8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/threads/local/DefaultThreadsLocalService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/threads/local/DefaultThreadsLocalService.kt
@@ -83,7 +83,8 @@ internal class DefaultThreadsLocalService @AssistedInject constructor(
                     realm = it,
                     roomId = roomId,
                     rootThreadEventId = rootThreadEventId,
-                    senderId = userId)
+                    senderId = userId
+            )
         }
     }
 
@@ -97,7 +98,8 @@ internal class DefaultThreadsLocalService @AssistedInject constructor(
         monarchy.awaitTransaction {
             EventEntity.where(
                     realm = it,
-                    eventId = rootThreadEventId).findFirst()?.threadNotificationState = ThreadNotificationState.NO_NEW_MESSAGE
+                    eventId = rootThreadEventId
+            ).findFirst()?.threadNotificationState = ThreadNotificationState.NO_NEW_MESSAGE
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
index 5064ebf49b..18fbe73c09 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
@@ -43,28 +43,32 @@ import org.matrix.android.sdk.internal.session.sync.handler.room.ReadReceiptHand
 import org.matrix.android.sdk.internal.session.sync.handler.room.ThreadsAwarenessHandler
 import org.matrix.android.sdk.internal.task.SemaphoreCoroutineSequencer
 import org.matrix.android.sdk.internal.util.createBackgroundHandler
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 import java.util.UUID
 import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicReference
 
-internal class DefaultTimeline(private val roomId: String,
-                               private val initialEventId: String?,
-                               private val realmConfiguration: RealmConfiguration,
-                               private val loadRoomMembersTask: LoadRoomMembersTask,
-                               private val readReceiptHandler: ReadReceiptHandler,
-                               private val settings: TimelineSettings,
-                               private val coroutineDispatchers: MatrixCoroutineDispatchers,
-                               paginationTask: PaginationTask,
-                               getEventTask: GetContextOfEventTask,
-                               fetchTokenAndPaginateTask: FetchTokenAndPaginateTask,
-                               fetchThreadTimelineTask: FetchThreadTimelineTask,
-                               timelineEventMapper: TimelineEventMapper,
-                               timelineInput: TimelineInput,
-                               threadsAwarenessHandler: ThreadsAwarenessHandler,
-                               lightweightSettingsStorage: LightweightSettingsStorage,
-                               eventDecryptor: TimelineEventDecryptor) : Timeline {
+internal class DefaultTimeline(
+        private val roomId: String,
+        private val initialEventId: String?,
+        private val realmConfiguration: RealmConfiguration,
+        private val loadRoomMembersTask: LoadRoomMembersTask,
+        private val readReceiptHandler: ReadReceiptHandler,
+        private val settings: TimelineSettings,
+        private val coroutineDispatchers: MatrixCoroutineDispatchers,
+        private val clock: Clock,
+        paginationTask: PaginationTask,
+        getEventTask: GetContextOfEventTask,
+        fetchTokenAndPaginateTask: FetchTokenAndPaginateTask,
+        fetchThreadTimelineTask: FetchThreadTimelineTask,
+        timelineEventMapper: TimelineEventMapper,
+        timelineInput: TimelineInput,
+        threadsAwarenessHandler: ThreadsAwarenessHandler,
+        lightweightSettingsStorage: LightweightSettingsStorage,
+        eventDecryptor: TimelineEventDecryptor,
+) : Timeline {
 
     companion object {
         val BACKGROUND_HANDLER = createBackgroundHandler("DefaultTimeline_Thread")
@@ -100,6 +104,7 @@ internal class DefaultTimeline(private val roomId: String,
             threadsAwarenessHandler = threadsAwarenessHandler,
             lightweightSettingsStorage = lightweightSettingsStorage,
             onEventsUpdated = this::sendSignalToPostSnapshot,
+            onEventsDeleted = this::onEventsDeleted,
             onLimitedTimeline = this::onLimitedTimeline,
             onNewTimelineEvents = this::onNewTimelineEvents
     )
@@ -304,6 +309,12 @@ internal class DefaultTimeline(private val roomId: String,
         }
     }
 
+    private fun onEventsDeleted() {
+        // Some event have been deleted, for instance when a user has been ignored.
+        // Restart the timeline (live)
+        restartWithEventId(null)
+    }
+
     private suspend fun postSnapshot() {
         val snapshot = strategy.buildSnapshot()
         Timber.v("Post snapshot of ${snapshot.size} events")
@@ -363,7 +374,8 @@ internal class DefaultTimeline(private val roomId: String,
                 roomId = roomId,
                 timelineId = timelineID,
                 mode = mode,
-                dependencies = strategyDependencies
+                dependencies = strategyDependencies,
+                clock = clock,
         )
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
index 826c9d7c48..6d63b24cf5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
@@ -34,6 +34,7 @@ import org.matrix.android.sdk.internal.session.room.membership.LoadRoomMembersTa
 import org.matrix.android.sdk.internal.session.room.relation.threads.FetchThreadTimelineTask
 import org.matrix.android.sdk.internal.session.sync.handler.room.ReadReceiptHandler
 import org.matrix.android.sdk.internal.session.sync.handler.room.ThreadsAwarenessHandler
+import org.matrix.android.sdk.internal.util.time.Clock
 
 internal class DefaultTimelineService @AssistedInject constructor(
         @Assisted private val roomId: String,
@@ -50,7 +51,8 @@ internal class DefaultTimelineService @AssistedInject constructor(
         private val lightweightSettingsStorage: LightweightSettingsStorage,
         private val readReceiptHandler: ReadReceiptHandler,
         private val coroutineDispatchers: MatrixCoroutineDispatchers,
-        private val timelineEventDataSource: TimelineEventDataSource
+        private val timelineEventDataSource: TimelineEventDataSource,
+        private val clock: Clock,
 ) : TimelineService {
 
     @AssistedFactory
@@ -75,7 +77,8 @@ internal class DefaultTimelineService @AssistedInject constructor(
                 readReceiptHandler = readReceiptHandler,
                 getEventTask = contextOfEventTask,
                 threadsAwarenessHandler = threadsAwarenessHandler,
-                lightweightSettingsStorage = lightweightSettingsStorage
+                lightweightSettingsStorage = lightweightSettingsStorage,
+                clock = clock
         )
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt
index 5bca5118b8..aef9e24c8b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt
@@ -24,6 +24,7 @@ import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.room.RoomAPI
 import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.time.Clock
 import javax.inject.Inject
 
 internal interface GetEventTask : Task<GetEventTask.Params, Event> {
@@ -36,7 +37,8 @@ internal interface GetEventTask : Task<GetEventTask.Params, Event> {
 internal class DefaultGetEventTask @Inject constructor(
         private val roomAPI: RoomAPI,
         private val globalErrorReceiver: GlobalErrorReceiver,
-        private val eventDecryptor: EventDecryptor
+        private val eventDecryptor: EventDecryptor,
+        private val clock: Clock,
 ) : GetEventTask {
 
     override suspend fun execute(params: GetEventTask.Params): Event {
@@ -59,7 +61,7 @@ internal class DefaultGetEventTask @Inject constructor(
                     }
         }
 
-        event.ageLocalTs = event.unsignedData?.age?.let { System.currentTimeMillis() - it }
+        event.ageLocalTs = event.unsignedData?.age?.let { clock.epochMillis() - it }
 
         return event
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LiveTimelineEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LiveTimelineEvent.kt
index 64b1a4ff1d..e765e05578 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LiveTimelineEvent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LiveTimelineEvent.kt
@@ -41,7 +41,7 @@ internal class LiveTimelineEvent(private val monarchy: Monarchy,
                                  private val timelineEventMapper: TimelineEventMapper,
                                  private val roomId: String,
                                  private val eventId: String) :
-    MediatorLiveData<Optional<TimelineEvent>>() {
+        MediatorLiveData<Optional<TimelineEvent>>() {
 
     init {
         buildAndObserveQuery()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
index ff986d04af..bcf202962c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
@@ -42,6 +42,7 @@ import org.matrix.android.sdk.internal.database.query.findLastForwardChunkOfThre
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.session.room.relation.threads.FetchThreadTimelineTask
 import org.matrix.android.sdk.internal.session.sync.handler.room.ThreadsAwarenessHandler
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 import java.util.concurrent.atomic.AtomicReference
 
@@ -53,11 +54,13 @@ import java.util.concurrent.atomic.AtomicReference
  * Once we got a ChunkEntity we wrap it with TimelineChunk class so we dispatch any methods for loading data.
  */
 
-internal class LoadTimelineStrategy(
+internal class LoadTimelineStrategy constructor(
         private val roomId: String,
         private val timelineId: String,
         private val mode: Mode,
-        private val dependencies: Dependencies) {
+        private val dependencies: Dependencies,
+        clock: Clock,
+) {
 
     sealed interface Mode {
         object Live : Mode
@@ -95,6 +98,7 @@ internal class LoadTimelineStrategy(
             val threadsAwarenessHandler: ThreadsAwarenessHandler,
             val lightweightSettingsStorage: LightweightSettingsStorage,
             val onEventsUpdated: (Boolean) -> Unit,
+            val onEventsDeleted: () -> Unit,
             val onLimitedTimeline: () -> Unit,
             val onNewTimelineEvents: (List<String>) -> Unit
     )
@@ -152,7 +156,7 @@ internal class LoadTimelineStrategy(
         }
     }
 
-    private val uiEchoManager = UIEchoManager(uiEchoManagerListener)
+    private val uiEchoManager = UIEchoManager(uiEchoManagerListener, clock)
     private val sendingEventsDataSource: SendingEventsDataSource = RealmSendingEventsDataSource(
             roomId = roomId,
             realm = dependencies.realm,
@@ -302,7 +306,8 @@ internal class LoadTimelineStrategy(
                     threadsAwarenessHandler = dependencies.threadsAwarenessHandler,
                     lightweightSettingsStorage = dependencies.lightweightSettingsStorage,
                     initialEventId = mode.originEventId(),
-                    onBuiltEvents = dependencies.onEventsUpdated
+                    onBuiltEvents = dependencies.onEventsUpdated,
+                    onEventsDeleted = dependencies.onEventsDeleted,
             )
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
index 4ead1d4ecb..8541c478ba 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
@@ -49,21 +49,24 @@ import java.util.concurrent.atomic.AtomicBoolean
  * It does mainly listen to the db timeline events.
  * It also triggers pagination to the server when needed, or dispatch to the prev or next chunk if any.
  */
-internal class TimelineChunk(private val chunkEntity: ChunkEntity,
-                             private val timelineSettings: TimelineSettings,
-                             private val roomId: String,
-                             private val timelineId: String,
-                             private val fetchThreadTimelineTask: FetchThreadTimelineTask,
-                             private val eventDecryptor: TimelineEventDecryptor,
-                             private val paginationTask: PaginationTask,
-                             private val realmConfiguration: RealmConfiguration,
-                             private val fetchTokenAndPaginateTask: FetchTokenAndPaginateTask,
-                             private val timelineEventMapper: TimelineEventMapper,
-                             private val uiEchoManager: UIEchoManager? = null,
-                             private val threadsAwarenessHandler: ThreadsAwarenessHandler,
-                             private val lightweightSettingsStorage: LightweightSettingsStorage,
-                             private val initialEventId: String?,
-                             private val onBuiltEvents: (Boolean) -> Unit) {
+internal class TimelineChunk(
+        private val chunkEntity: ChunkEntity,
+        private val timelineSettings: TimelineSettings,
+        private val roomId: String,
+        private val timelineId: String,
+        private val fetchThreadTimelineTask: FetchThreadTimelineTask,
+        private val eventDecryptor: TimelineEventDecryptor,
+        private val paginationTask: PaginationTask,
+        private val realmConfiguration: RealmConfiguration,
+        private val fetchTokenAndPaginateTask: FetchTokenAndPaginateTask,
+        private val timelineEventMapper: TimelineEventMapper,
+        private val uiEchoManager: UIEchoManager?,
+        private val threadsAwarenessHandler: ThreadsAwarenessHandler,
+        private val lightweightSettingsStorage: LightweightSettingsStorage,
+        private val initialEventId: String?,
+        private val onBuiltEvents: (Boolean) -> Unit,
+        private val onEventsDeleted: () -> Unit,
+) {
 
     private val isLastForward = AtomicBoolean(chunkEntity.isLastForward)
     private val isLastBackward = AtomicBoolean(chunkEntity.isLastBackward)
@@ -177,12 +180,14 @@ internal class TimelineChunk(private val chunkEntity: ChunkEntity,
         val rootThreadEventId = timelineSettings.rootThreadEventId ?: return LoadMoreResult.FAILURE
         return if (direction == Timeline.Direction.BACKWARDS) {
             try {
-                fetchThreadTimelineTask.execute(FetchThreadTimelineTask.Params(
-                        roomId,
-                        rootThreadEventId,
-                        chunkEntity.prevToken,
-                        count
-                )).toLoadMoreResult()
+                fetchThreadTimelineTask.execute(
+                        FetchThreadTimelineTask.Params(
+                                roomId,
+                                rootThreadEventId,
+                                chunkEntity.prevToken,
+                                count
+                        )
+                ).toLoadMoreResult()
             } catch (failure: Throwable) {
                 Timber.e(failure, "Failed to fetch thread timeline events from the server")
                 LoadMoreResult.FAILURE
@@ -236,10 +241,12 @@ internal class TimelineChunk(private val chunkEntity: ChunkEntity,
      * Simple log that displays the number and timeline of loaded events
      */
     private fun logLoadedFromStorage(loadedFromStorage: LoadedFromStorage, direction: Timeline.Direction) {
-        Timber.v("[" +
-                "${if (timelineSettings.isThreadTimeline()) "ThreadTimeLine" else "Timeline"}] Has loaded " +
-                "${loadedFromStorage.numberOfEvents} items from storage in $direction " +
-                if (timelineSettings.isThreadTimeline() && loadedFromStorage.threadReachedEnd) "[Reached End]" else "")
+        Timber.v(
+                "[" +
+                        "${if (timelineSettings.isThreadTimeline()) "ThreadTimeLine" else "Timeline"}] Has loaded " +
+                        "${loadedFromStorage.numberOfEvents} items from storage in $direction " +
+                        if (timelineSettings.isThreadTimeline() && loadedFromStorage.threadReachedEnd) "[Reached End]" else ""
+        )
     }
 
     fun getBuiltEventIndex(eventId: String, searchInNext: Boolean, searchInPrev: Boolean): Int? {
@@ -358,7 +365,8 @@ internal class TimelineChunk(private val chunkEntity: ChunkEntity,
                 }
         return LoadedFromStorage(
                 threadReachedEnd = threadReachedEnd(timelineEvents),
-                numberOfEvents = timelineEvents.size)
+                numberOfEvents = timelineEvents.size
+        )
     }
 
     /**
@@ -505,6 +513,11 @@ internal class TimelineChunk(private val chunkEntity: ChunkEntity,
         if (insertions.isNotEmpty() || modifications.isNotEmpty()) {
             onBuiltEvents(true)
         }
+
+        val deletions = changeSet.deletions
+        if (deletions.isNotEmpty()) {
+            onEventsDeleted()
+        }
     }
 
     private fun getNextDisplayIndex(direction: Timeline.Direction): Int? {
@@ -543,7 +556,8 @@ internal class TimelineChunk(private val chunkEntity: ChunkEntity,
                 threadsAwarenessHandler = threadsAwarenessHandler,
                 lightweightSettingsStorage = lightweightSettingsStorage,
                 initialEventId = null,
-                onBuiltEvents = this.onBuiltEvents
+                onBuiltEvents = this.onBuiltEvents,
+                onEventsDeleted = this.onEventsDeleted
         )
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDataSource.kt
index 638866a46e..8b58d3ca5c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDataSource.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.session.room.timeline
 import androidx.lifecycle.LiveData
 import com.zhuinden.monarchy.Monarchy
 import io.realm.Sort
-import io.realm.kotlin.where
 import org.matrix.android.sdk.api.session.events.model.isImageMessage
 import org.matrix.android.sdk.api.session.events.model.isVideoMessage
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
@@ -29,6 +28,7 @@ import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
 import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.database.query.whereRoomId
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import javax.inject.Inject
@@ -53,8 +53,7 @@ internal class TimelineEventDataSource @Inject constructor(private val realmSess
     fun getAttachmentMessages(roomId: String): List<TimelineEvent> {
         // TODO pretty bad query.. maybe we should denormalize clear type in base?
         return realmSessionProvider.withRealm { realm ->
-            realm.where<TimelineEventEntity>()
-                    .equalTo(TimelineEventEntityFields.ROOM_ID, roomId)
+            TimelineEventEntity.whereRoomId(realm, roomId)
                     .sort(TimelineEventEntityFields.DISPLAY_INDEX, Sort.ASCENDING)
                     .findAll()
                     ?.mapNotNull { timelineEventMapper.map(it).takeIf { it.root.isImageMessage() || it.root.isVideoMessage() } }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt
index 5c30dc20d9..de79661de0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt
@@ -99,9 +99,7 @@ internal class TimelineEventDecryptor @Inject constructor(
         executor?.execute {
             Realm.getInstance(realmConfiguration).use { realm ->
                 try {
-                    runBlocking {
-                        processDecryptRequest(request, realm)
-                    }
+                    processDecryptRequest(request, realm)
                 } catch (e: InterruptedException) {
                     Timber.i("Decryption got interrupted")
                 }
@@ -121,7 +119,7 @@ internal class TimelineEventDecryptor @Inject constructor(
         }
     }
 
-    private suspend fun processDecryptRequest(request: DecryptionRequest, realm: Realm) {
+    private fun processDecryptRequest(request: DecryptionRequest, realm: Realm) {
         val event = request.event
         val timelineId = request.timelineId
 
@@ -132,7 +130,8 @@ internal class TimelineEventDecryptor @Inject constructor(
             return
         }
         try {
-            val result = cryptoService.decryptEvent(request.event, timelineId)
+            // note: runBlocking should be used here while we are in realm single thread executor, to avoid thread switching
+            val result = runBlocking { cryptoService.decryptEvent(request.event, timelineId) }
             Timber.v("Successfully decrypted event ${event.eventId}")
             realm.executeTransaction {
                 val eventId = event.eventId ?: return@executeTransaction
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
index d3f24a8568..96ceb6c6dc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
@@ -44,6 +44,7 @@ import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.StreamEventsManager
 import org.matrix.android.sdk.internal.util.awaitTransaction
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -54,7 +55,9 @@ internal class TokenChunkEventPersistor @Inject constructor(
         @SessionDatabase private val monarchy: Monarchy,
         @UserId private val userId: String,
         private val lightweightSettingsStorage: LightweightSettingsStorage,
-        private val liveEventManager: Lazy<StreamEventsManager>) {
+        private val liveEventManager: Lazy<StreamEventsManager>,
+        private val clock: Clock,
+) {
 
     enum class Result {
         SHOULD_FETCH_MORE,
@@ -166,7 +169,7 @@ internal class TokenChunkEventPersistor @Inject constructor(
         val eventList = receivedChunk.events
         val stateEvents = receivedChunk.stateEvents
 
-        val now = System.currentTimeMillis()
+        val now = clock.epochMillis()
 
         stateEvents?.forEach { stateEvent ->
             val ageLocalTs = stateEvent.unsignedData?.age?.let { now - it }
@@ -227,7 +230,8 @@ internal class TokenChunkEventPersistor @Inject constructor(
                         roomId = roomId,
                         eventEntity = eventEntity,
                         direction = direction,
-                        roomMemberContentsByUser = roomMemberContentsByUser)
+                        roomMemberContentsByUser = roomMemberContentsByUser
+                )
                 if (lightweightSettingsStorage.areThreadMessagesEnabled()) {
                     eventEntity.rootThreadEventId?.let {
                         // This is a thread event
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt
index bb92623249..828e01955a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt
@@ -24,10 +24,14 @@ import org.matrix.android.sdk.api.session.room.model.ReactionAggregatedSummary
 import org.matrix.android.sdk.api.session.room.model.relation.ReactionContent
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 import java.util.Collections
 
-internal class UIEchoManager(private val listener: Listener) {
+internal class UIEchoManager(
+        private val listener: Listener,
+        private val clock: Clock,
+) {
 
     interface Listener {
         fun rebuildEvent(eventId: String, builder: (TimelineEvent) -> TimelineEvent?): Boolean
@@ -98,9 +102,7 @@ internal class UIEchoManager(private val listener: Listener) {
         val relatedEventID = timelineEvent.eventId
         val contents = inMemoryReactions[relatedEventID] ?: return timelineEvent
 
-        var existingAnnotationSummary = timelineEvent.annotations ?: EventAnnotationsSummary(
-                relatedEventID
-        )
+        var existingAnnotationSummary = timelineEvent.annotations ?: EventAnnotationsSummary()
         val updateReactions = existingAnnotationSummary.reactionsSummary.toMutableList()
 
         contents.forEach { uiEchoReaction ->
@@ -111,7 +113,7 @@ internal class UIEchoManager(private val listener: Listener) {
                         key = uiEchoReaction.reaction,
                         count = 1,
                         addedByMe = true,
-                        firstTimestamp = System.currentTimeMillis(),
+                        firstTimestamp = clock.epochMillis(),
                         sourceEvents = emptyList(),
                         localEchoEvents = listOf(uiEchoReaction.localEchoId)
                 ).let { updateReactions.add(it) }
@@ -145,7 +147,7 @@ internal class UIEchoManager(private val listener: Listener) {
     fun updateSentStateWithUiEcho(timelineEvent: TimelineEvent): TimelineEvent {
         if (timelineEvent.root.sendState.isSent()) return timelineEvent
         val inMemoryState = inMemorySendingStates[timelineEvent.eventId] ?: return timelineEvent
-        // Timber.v("## ${System.currentTimeMillis()} Send event refresh echo with live state $inMemoryState from state ${element.root.sendState}")
+        // Timber.v("## ${clock.epochMillis()} Send event refresh echo with live state $inMemoryState from state ${element.root.sendState}")
         return timelineEvent.copy(
                 root = timelineEvent.root.copyAll()
                         .also { it.sendState = inMemoryState }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
index 8033b0654d..12ca36fa6b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
@@ -32,15 +32,17 @@ internal class DefaultSearchService @Inject constructor(
                                 beforeLimit: Int,
                                 afterLimit: Int,
                                 includeProfile: Boolean): SearchResult {
-        return searchTask.execute(SearchTask.Params(
-                searchTerm = searchTerm,
-                roomId = roomId,
-                nextBatch = nextBatch,
-                orderByRecent = orderByRecent,
-                limit = limit,
-                beforeLimit = beforeLimit,
-                afterLimit = afterLimit,
-                includeProfile = includeProfile
-        ))
+        return searchTask.execute(
+                SearchTask.Params(
+                        searchTerm = searchTerm,
+                        roomId = roomId,
+                        nextBatch = nextBatch,
+                        orderByRecent = orderByRecent,
+                        limit = limit,
+                        beforeLimit = beforeLimit,
+                        afterLimit = afterLimit,
+                        includeProfile = includeProfile
+                )
+        )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
index 3ba7d11c3d..fcaf3b60a7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
@@ -87,7 +87,7 @@ internal class DefaultSearchTask @Inject constructor(
                 results = searchCategories.roomEvents?.results?.map { searchResponseItem ->
 
                     val localThreadEventDetails = localTimelineEvents
-                            ?.firstOrNull { it.eventId ==  searchResponseItem.event.eventId }
+                            ?.firstOrNull { it.eventId == searchResponseItem.event.eventId }
                             ?.root
                             ?.asDomain()
                             ?.threadDetails
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt
index 17dc90fdb0..267023d186 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt
@@ -169,8 +169,10 @@ internal class SecretStoringUtils @Inject constructor(
         if (secretKeyEntry == null) {
             // we generate it
             val generator = KeyGenerator.getInstance(KeyProperties.KEY_ALGORITHM_AES, "AndroidKeyStore")
-            val keyGenSpec = KeyGenParameterSpec.Builder(alias,
-                    KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT)
+            val keyGenSpec = KeyGenParameterSpec.Builder(
+                    alias,
+                    KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT
+            )
                     .setBlockModes(KeyProperties.BLOCK_MODE_GCM)
                     .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
                     .setKeySize(128)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
index 303eda49d8..178a29a5a0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
@@ -60,7 +60,7 @@ internal class DefaultSpace(
                         }
                         ?: viaParameterFinder.computeViaParams(roomId, 3))
 
-        room.sendStateEvent(
+        room.stateService().sendStateEvent(
                 eventType = EventType.STATE_SPACE_CHILD,
                 stateKey = roomId,
                 body = SpaceChildContent(
@@ -79,7 +79,7 @@ internal class DefaultSpace(
 //                return
 
         // edit state event and set via to null
-        room.sendStateEvent(
+        room.stateService().sendStateEvent(
                 eventType = EventType.STATE_SPACE_CHILD,
                 stateKey = roomId,
                 body = SpaceChildContent(
@@ -91,19 +91,19 @@ internal class DefaultSpace(
     }
 
     override fun getChildInfo(roomId: String): SpaceChildContent? {
-        return room.getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
+        return room.stateService().getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
                 .firstOrNull()
                 ?.content.toModel<SpaceChildContent>()
     }
 
     override suspend fun setChildrenOrder(roomId: String, order: String?) {
-        val existing = room.getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
+        val existing = room.stateService().getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
                 .firstOrNull()
                 ?.content.toModel<SpaceChildContent>()
                 ?: throw IllegalArgumentException("$roomId is not a child of this space")
 
         // edit state event and set via to null
-        room.sendStateEvent(
+        room.stateService().sendStateEvent(
                 eventType = EventType.STATE_SPACE_CHILD,
                 stateKey = roomId,
                 body = SpaceChildContent(
@@ -140,7 +140,7 @@ internal class DefaultSpace(
 //    }
 
     override suspend fun setChildrenSuggested(roomId: String, suggested: Boolean) {
-        val existing = room.getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
+        val existing = room.stateService().getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
                 .firstOrNull()
                 ?.content.toModel<SpaceChildContent>()
                 ?: throw IllegalArgumentException("$roomId is not a child of this space")
@@ -150,7 +150,7 @@ internal class DefaultSpace(
             return
         }
         // edit state event and set via to null
-        room.sendStateEvent(
+        room.stateService().sendStateEvent(
                 eventType = EventType.STATE_SPACE_CHILD,
                 stateKey = roomId,
                 body = SpaceChildContent(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index 05cff7dd89..9320665688 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -18,12 +18,15 @@ package org.matrix.android.sdk.internal.session.space
 
 import android.net.Uri
 import androidx.lifecycle.LiveData
+import kotlinx.coroutines.withContext
+import org.matrix.android.sdk.api.MatrixCoroutineDispatchers
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.RoomSortOrder
+import org.matrix.android.sdk.api.session.room.getStateEvent
 import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
@@ -64,7 +67,8 @@ internal class DefaultSpaceService @Inject constructor(
         private val stateEventDataSource: StateEventDataSource,
         private val peekSpaceTask: PeekSpaceTask,
         private val resolveSpaceInfoTask: ResolveSpaceInfoTask,
-        private val leaveRoomTask: LeaveRoomTask
+        private val leaveRoomTask: LeaveRoomTask,
+        private val coroutineDispatchers: MatrixCoroutineDispatchers,
 ) : SpaceService {
 
     override suspend fun createSpace(params: CreateSpaceParams): String {
@@ -105,8 +109,10 @@ internal class DefaultSpaceService @Inject constructor(
         return roomSummaryDataSource.getSpaceSummaries(spaceSummaryQueryParams, sortOrder)
     }
 
-    override fun getRootSpaceSummaries(): List<RoomSummary> {
-        return roomSummaryDataSource.getRootSpaceSummaries()
+    override suspend fun getRootSpaceSummaries(): List<RoomSummary> {
+        return withContext(coroutineDispatchers.io) {
+            roomSummaryDataSource.getRootSpaceSummaries()
+        }
     }
 
     override suspend fun peekSpace(spaceId: String): SpacePeekResult {
@@ -253,7 +259,7 @@ internal class DefaultSpaceService @Inject constructor(
         val room = roomGetter.getRoom(childRoomId)
                 ?: throw IllegalArgumentException("Unknown Room $childRoomId")
 
-        room.sendStateEvent(
+        room.stateService().sendStateEvent(
                 eventType = EventType.STATE_SPACE_PARENT,
                 stateKey = parentSpaceId,
                 body = SpaceParentContent(
@@ -271,7 +277,7 @@ internal class DefaultSpaceService @Inject constructor(
         if (existingEvent != null) {
             // Should i check if it was sent by me?
             // we don't check power level, it will throw if you cannot do that
-            room.sendStateEvent(
+            room.stateService().sendStateEvent(
                     eventType = EventType.STATE_SPACE_PARENT,
                     stateKey = parentSpaceId,
                     body = SpaceParentContent(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
index 7eeaed4ff6..a0925cabcc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
@@ -49,11 +49,13 @@ internal class DefaultJoinSpaceTask @Inject constructor(
     override suspend fun execute(params: JoinSpaceTask.Params): JoinSpaceResult {
         Timber.v("## Space: > Joining root space ${params.roomIdOrAlias} ...")
         try {
-            joinRoomTask.execute(JoinRoomTask.Params(
-                    params.roomIdOrAlias,
-                    params.reason,
-                    params.viaServers
-            ))
+            joinRoomTask.execute(
+                    JoinRoomTask.Params(
+                            params.roomIdOrAlias,
+                            params.reason,
+                            params.viaServers
+                    )
+            )
         } catch (failure: Throwable) {
             return JoinSpaceResult.Fail(failure)
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStatusRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStatusRepository.kt
index bd20ada28b..8e0c3422b9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStatusRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStatusRepository.kt
@@ -20,6 +20,7 @@ import com.squareup.moshi.JsonClass
 import okio.buffer
 import okio.source
 import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 import java.io.File
 
@@ -46,7 +47,10 @@ internal interface InitialSyncStatusRepository {
 /**
  * This class handle the current status of an initial sync and persist it on the disk, to be robust against crash
  */
-internal class FileInitialSyncStatusRepository(directory: File) : InitialSyncStatusRepository {
+internal class FileInitialSyncStatusRepository(
+        directory: File,
+        private val clock: Clock,
+) : InitialSyncStatusRepository {
 
     companion object {
         // After 2 hours, we consider that the downloaded file is outdated:
@@ -64,7 +68,7 @@ internal class FileInitialSyncStatusRepository(directory: File) : InitialSyncSta
         ensureCache()
         val state = cache?.step ?: InitialSyncStatus.STEP_INIT
         return if (state >= InitialSyncStatus.STEP_DOWNLOADED &&
-                System.currentTimeMillis() > (cache?.downloadedDate ?: 0) + INIT_SYNC_FILE_LIFETIME) {
+                clock.epochMillis() > (cache?.downloadedDate ?: 0) + INIT_SYNC_FILE_LIFETIME) {
             Timber.d("INIT_SYNC downloaded file is outdated, download it again")
             // The downloaded file is outdated
             setStep(InitialSyncStatus.STEP_INIT)
@@ -79,7 +83,7 @@ internal class FileInitialSyncStatusRepository(directory: File) : InitialSyncSta
         if (step == InitialSyncStatus.STEP_DOWNLOADED) {
             // Also store the downloaded date
             newStatus = newStatus.copy(
-                    downloadedDate = System.currentTimeMillis()
+                    downloadedDate = clock.epochMillis()
             )
         }
         cache = newStatus
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncPresence.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncPresence.kt
index 4f1fe43b7d..42cd972e0c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncPresence.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncPresence.kt
@@ -34,11 +34,12 @@ internal enum class SyncPresence(val value: String) {
     companion object {
         fun from(presenceEnum: PresenceEnum): SyncPresence {
             return when (presenceEnum) {
-                PresenceEnum.ONLINE -> Online
-                PresenceEnum.OFFLINE -> Offline
+                PresenceEnum.ONLINE      -> Online
+                PresenceEnum.OFFLINE     -> Offline
                 PresenceEnum.UNAVAILABLE -> Unavailable
             }
         }
+
         fun from(s: String?): SyncPresence? = values().find { it.value == s }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
index 97850e81d3..02a7a9a37f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
@@ -18,9 +18,9 @@ package org.matrix.android.sdk.internal.session.sync
 
 import androidx.work.ExistingPeriodicWorkPolicy
 import com.zhuinden.monarchy.Monarchy
-import org.matrix.android.sdk.api.pushrules.PushRuleService
-import org.matrix.android.sdk.api.pushrules.RuleScope
 import org.matrix.android.sdk.api.session.initsync.InitSyncStep
+import org.matrix.android.sdk.api.session.pushrules.PushRuleService
+import org.matrix.android.sdk.api.session.pushrules.RuleScope
 import org.matrix.android.sdk.api.session.sync.model.GroupsSyncResponse
 import org.matrix.android.sdk.api.session.sync.model.RoomsSyncResponse
 import org.matrix.android.sdk.api.session.sync.model.SyncResponse
@@ -34,7 +34,7 @@ import org.matrix.android.sdk.internal.session.dispatchTo
 import org.matrix.android.sdk.internal.session.group.GetGroupDataWorker
 import org.matrix.android.sdk.internal.session.initsync.ProgressReporter
 import org.matrix.android.sdk.internal.session.initsync.reportSubtask
-import org.matrix.android.sdk.internal.session.notification.ProcessEventForPushTask
+import org.matrix.android.sdk.internal.session.pushrules.ProcessEventForPushTask
 import org.matrix.android.sdk.internal.session.sync.handler.CryptoSyncHandler
 import org.matrix.android.sdk.internal.session.sync.handler.GroupSyncHandler
 import org.matrix.android.sdk.internal.session.sync.handler.PresenceSyncHandler
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
index b56f897749..f88d973101 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
@@ -44,6 +44,7 @@ import org.matrix.android.sdk.internal.session.sync.parsing.InitialSyncResponseP
 import org.matrix.android.sdk.internal.session.user.UserStore
 import org.matrix.android.sdk.internal.task.Task
 import org.matrix.android.sdk.internal.util.logDuration
+import org.matrix.android.sdk.internal.util.time.Clock
 import retrofit2.Response
 import retrofit2.awaitResponse
 import timber.log.Timber
@@ -78,11 +79,12 @@ internal class DefaultSyncTask @Inject constructor(
         @SessionFilesDirectory
         private val fileDirectory: File,
         private val syncResponseParser: InitialSyncResponseParser,
-        private val roomSyncEphemeralTemporaryStore: RoomSyncEphemeralTemporaryStore
+        private val roomSyncEphemeralTemporaryStore: RoomSyncEphemeralTemporaryStore,
+        private val clock: Clock,
 ) : SyncTask {
 
     private val workingDir = File(fileDirectory, "is")
-    private val initialSyncStatusRepository: InitialSyncStatusRepository = FileInitialSyncStatusRepository(workingDir)
+    private val initialSyncStatusRepository: InitialSyncStatusRepository = FileInitialSyncStatusRepository(workingDir, clock)
 
     override suspend fun execute(params: SyncTask.Params): SyncResponse {
         return syncTaskSequencer.post {
@@ -107,11 +109,12 @@ internal class DefaultSyncTask @Inject constructor(
         val isInitialSync = token == null
         if (isInitialSync) {
             // We might want to get the user information in parallel too
-            val user = tryOrNull { session.getProfileAsUser(userId) }
+            val user = tryOrNull { session.profileService().getProfileAsUser(userId) }
             userStore.createOrUpdate(
                     userId = userId,
                     displayName = user?.displayName,
-                    avatarUrl = user?.avatarUrl)
+                    avatarUrl = user?.avatarUrl
+            )
             defaultSyncStatusService.startRoot(InitSyncStep.ImportingAccount, 100)
         }
         // Maybe refresh the homeserver capabilities data we know
@@ -124,7 +127,7 @@ internal class DefaultSyncTask @Inject constructor(
         if (isInitialSync) {
             Timber.tag(loggerTag.value).d("INIT_SYNC with filter: ${requestParams["filter"]}")
             val initSyncStrategy = initialSyncStrategy
-            logDuration("INIT_SYNC strategy: $initSyncStrategy", loggerTag) {
+            logDuration("INIT_SYNC strategy: $initSyncStrategy", loggerTag, clock) {
                 if (initSyncStrategy is InitialSyncStrategy.Optimized) {
                     roomSyncEphemeralTemporaryStore.reset()
                     workingDir.mkdirs()
@@ -135,7 +138,7 @@ internal class DefaultSyncTask @Inject constructor(
                     // Delete all files
                     workingDir.deleteRecursively()
                 } else {
-                    val syncResponse = logDuration("INIT_SYNC Request", loggerTag) {
+                    val syncResponse = logDuration("INIT_SYNC Request", loggerTag, clock) {
                         executeRequest(globalErrorReceiver) {
                             syncAPI.sync(
                                     params = requestParams,
@@ -146,7 +149,7 @@ internal class DefaultSyncTask @Inject constructor(
                     // We cannot distinguish request and download in this case.
                     syncStatisticsData.requestInitSyncTime = SystemClock.elapsedRealtime()
                     syncStatisticsData.downloadInitSyncTime = syncStatisticsData.requestInitSyncTime
-                    logDuration("INIT_SYNC Database insertion", loggerTag) {
+                    logDuration("INIT_SYNC Database insertion", loggerTag, clock) {
                         syncResponseHandler.handleResponse(syncResponse, token, defaultSyncStatusService)
                     }
                     syncResponseToReturn = syncResponse
@@ -172,12 +175,14 @@ internal class DefaultSyncTask @Inject constructor(
             val nbToDevice = syncResponse.toDevice?.events.orEmpty().size
             val nextBatch = syncResponse.nextBatch
             Timber.tag(loggerTag.value).d(
-                "Incremental sync request parsing, $nbRooms room(s) $nbToDevice toDevice(s). Got nextBatch: $nextBatch"
+                    "Incremental sync request parsing, $nbRooms room(s) $nbToDevice toDevice(s). Got nextBatch: $nextBatch"
+            )
+            defaultSyncStatusService.setStatus(
+                    SyncStatusService.Status.IncrementalSyncParsing(
+                            rooms = nbRooms,
+                            toDevice = nbToDevice
+                    )
             )
-            defaultSyncStatusService.setStatus(SyncStatusService.Status.IncrementalSyncParsing(
-                    rooms = nbRooms,
-                    toDevice = nbToDevice
-            ))
             syncResponseHandler.handleResponse(syncResponse, token, null)
             syncResponseToReturn = syncResponse
             Timber.tag(loggerTag.value).d("Incremental sync done")
@@ -201,14 +206,14 @@ internal class DefaultSyncTask @Inject constructor(
             }
         } else {
             initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_DOWNLOADING)
-            val syncResponse = logDuration("INIT_SYNC Perform server request", loggerTag) {
+            val syncResponse = logDuration("INIT_SYNC Perform server request", loggerTag, clock) {
                 reportSubtask(defaultSyncStatusService, InitSyncStep.ServerComputing, 1, 0.2f) {
                     getSyncResponse(requestParams, MAX_NUMBER_OF_RETRY_AFTER_TIMEOUT)
                 }
             }
             syncStatisticsData.requestInitSyncTime = SystemClock.elapsedRealtime()
             if (syncResponse.isSuccessful) {
-                logDuration("INIT_SYNC Download and save to file", loggerTag) {
+                logDuration("INIT_SYNC Download and save to file", loggerTag, clock) {
                     reportSubtask(defaultSyncStatusService, InitSyncStep.Downloading, 1, 0.1f) {
                         syncResponse.body()?.byteStream()?.use { inputStream ->
                             workingFile.outputStream().use { outputStream ->
@@ -247,8 +252,8 @@ internal class DefaultSyncTask @Inject constructor(
     }
 
     private suspend fun handleSyncFile(workingFile: File, initSyncStrategy: InitialSyncStrategy.Optimized): SyncResponse {
-        return logDuration("INIT_SYNC handleSyncFile()", loggerTag) {
-            val syncResponse = logDuration("INIT_SYNC Read file and parse", loggerTag) {
+        return logDuration("INIT_SYNC handleSyncFile()", loggerTag, clock) {
+            val syncResponse = logDuration("INIT_SYNC Read file and parse", loggerTag, clock) {
                 syncResponseParser.parse(initSyncStrategy, workingFile)
             }
             initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_PARSED)
@@ -257,7 +262,7 @@ internal class DefaultSyncTask @Inject constructor(
             val nbOfJoinedRoomsInFile = syncResponse.rooms?.join?.values?.count { it.ephemeral is LazyRoomSyncEphemeral.Stored }
             Timber.tag(loggerTag.value).d("INIT_SYNC $nbOfJoinedRooms rooms, $nbOfJoinedRoomsInFile ephemeral stored into files")
 
-            logDuration("INIT_SYNC Database insertion", loggerTag) {
+            logDuration("INIT_SYNC Database insertion", loggerTag, clock) {
                 syncResponseHandler.handleResponse(syncResponse, null, defaultSyncStatusService)
             }
             initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_SUCCESS)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/SyncResponsePostTreatmentAggregatorHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/SyncResponsePostTreatmentAggregatorHandler.kt
index 25de05602a..c638ed4f80 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/SyncResponsePostTreatmentAggregatorHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/SyncResponsePostTreatmentAggregatorHandler.kt
@@ -28,6 +28,7 @@ import org.matrix.android.sdk.internal.session.sync.model.accountdata.toMutable
 import org.matrix.android.sdk.internal.session.user.UserEntityFactory
 import org.matrix.android.sdk.internal.session.user.accountdata.DirectChatsHelper
 import org.matrix.android.sdk.internal.session.user.accountdata.UpdateUserAccountDataTask
+import org.matrix.android.sdk.internal.util.awaitTransaction
 import javax.inject.Inject
 
 internal class SyncResponsePostTreatmentAggregatorHandler @Inject constructor(
@@ -91,9 +92,9 @@ internal class SyncResponsePostTreatmentAggregatorHandler @Inject constructor(
         }
     }
 
-    private fun List<User>.saveLocally() {
+    private suspend fun List<User>.saveLocally() {
         val userEntities = map { user -> UserEntityFactory.create(user) }
-        monarchy.doWithRealm {
+        monarchy.awaitTransaction {
             it.insertOrUpdate(userEntities)
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/UserAccountDataSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/UserAccountDataSyncHandler.kt
index 7f80486c70..c213ea4bcf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/UserAccountDataSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/UserAccountDataSyncHandler.kt
@@ -20,17 +20,19 @@ import com.zhuinden.monarchy.Monarchy
 import io.realm.Realm
 import io.realm.RealmList
 import io.realm.kotlin.where
-import org.matrix.android.sdk.api.pushrules.RuleScope
-import org.matrix.android.sdk.api.pushrules.RuleSetKey
-import org.matrix.android.sdk.api.pushrules.rest.GetPushRulesResponse
+import org.matrix.android.sdk.api.failure.GlobalError
+import org.matrix.android.sdk.api.failure.InitialSyncRequestReason
 import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
 import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
 import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.pushrules.RuleScope
+import org.matrix.android.sdk.api.session.pushrules.RuleSetKey
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.sync.model.InvitedRoomSync
 import org.matrix.android.sdk.api.session.sync.model.UserAccountDataSync
+import org.matrix.android.sdk.internal.SessionManager
 import org.matrix.android.sdk.internal.database.mapper.ContentMapper
 import org.matrix.android.sdk.internal.database.mapper.PushRulesMapper
 import org.matrix.android.sdk.internal.database.mapper.asDomain
@@ -39,14 +41,20 @@ import org.matrix.android.sdk.internal.database.model.IgnoredUserEntity
 import org.matrix.android.sdk.internal.database.model.PushRulesEntity
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import org.matrix.android.sdk.internal.database.model.UserAccountDataEntity
 import org.matrix.android.sdk.internal.database.model.UserAccountDataEntityFields
 import org.matrix.android.sdk.internal.database.model.deleteOnCascade
+import org.matrix.android.sdk.internal.database.query.findAllFrom
 import org.matrix.android.sdk.internal.database.query.getDirectRooms
 import org.matrix.android.sdk.internal.database.query.getOrCreate
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.di.SessionId
 import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.SessionListeners
+import org.matrix.android.sdk.internal.session.dispatchTo
+import org.matrix.android.sdk.internal.session.pushers.GetPushRulesResponse
 import org.matrix.android.sdk.internal.session.room.RoomAvatarResolver
 import org.matrix.android.sdk.internal.session.room.membership.RoomDisplayNameResolver
 import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
@@ -65,7 +73,10 @@ internal class UserAccountDataSyncHandler @Inject constructor(
         private val directChatsHelper: DirectChatsHelper,
         private val updateUserAccountDataTask: UpdateUserAccountDataTask,
         private val roomAvatarResolver: RoomAvatarResolver,
-        private val roomDisplayNameResolver: RoomDisplayNameResolver
+        private val roomDisplayNameResolver: RoomDisplayNameResolver,
+        @SessionId private val sessionId: String,
+        private val sessionManager: SessionManager,
+        private val sessionListeners: SessionListeners
 ) {
 
     fun handle(realm: Realm, accountData: UserAccountDataSync?) {
@@ -184,12 +195,36 @@ internal class UserAccountDataSyncHandler @Inject constructor(
 
     private fun handleIgnoredUsers(realm: Realm, event: UserAccountDataEvent) {
         val userIds = event.content.toModel<IgnoredUsersContent>()?.ignoredUsers?.keys ?: return
-        realm.where(IgnoredUserEntity::class.java)
-                .findAll()
-                .deleteAllFromRealm()
+        val currentIgnoredUsers = realm.where(IgnoredUserEntity::class.java).findAll()
+        val currentIgnoredUserIds = currentIgnoredUsers.map { it.userId }
+        // Delete the previous list
+        currentIgnoredUsers.deleteAllFromRealm()
         // And save the new received list
         userIds.forEach { realm.createObject(IgnoredUserEntity::class.java).apply { userId = it } }
-        // TODO If not initial sync, we should execute a init sync
+
+        // Delete all the TimelineEvents for all the ignored users
+        // See https://spec.matrix.org/latest/client-server-api/#client-behaviour-22 :
+        // "Once ignored, the client will no longer receive events sent by that user, with the exception of state events"
+        // So just delete all non-state events from our local storage.
+        TimelineEventEntity.findAllFrom(realm, userIds)
+                .also { Timber.d("Deleting ${it.size} TimelineEventEntity from ignored users") }
+                .forEach {
+                    it.deleteOnCascade(true)
+                }
+
+        // Handle the case when some users are unignored from another session
+        val mustRefreshCache = currentIgnoredUserIds.any { currentIgnoredUserId -> currentIgnoredUserId !in userIds }
+        if (mustRefreshCache) {
+            Timber.d("A user has been unignored from another session, an initial sync should be performed")
+            dispatchMustRefresh()
+        }
+    }
+
+    private fun dispatchMustRefresh() {
+        val session = sessionManager.getSessionComponent(sessionId)?.session()
+        session.dispatchTo(sessionListeners) { safeSession, listener ->
+            listener.onGlobalError(safeSession, GlobalError.InitialSyncRequest(InitialSyncRequestReason.IGNORED_USERS_LIST_CHANGE))
+        }
     }
 
     private fun handleBreadcrumbs(realm: Realm, event: UserAccountDataEvent) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ReadReceiptHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ReadReceiptHandler.kt
index 2c84f1e692..77bee18df9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ReadReceiptHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ReadReceiptHandler.kt
@@ -44,12 +44,14 @@ internal class ReadReceiptHandler @Inject constructor(
 
     companion object {
 
-        fun createContent(userId: String, eventId: String): ReadReceiptContent {
+        fun createContent(userId: String,
+                          eventId: String,
+                          currentTimeMillis: Long): ReadReceiptContent {
             return mapOf(
                     eventId to mapOf(
                             READ_KEY to mapOf(
                                     userId to mapOf(
-                                            TIMESTAMP_KEY to System.currentTimeMillis().toDouble()
+                                            TIMESTAMP_KEY to currentTimeMillis.toDouble()
                                     )
                             )
                     )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
index afd8e1bb99..5437a015fd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
@@ -79,22 +79,26 @@ import org.matrix.android.sdk.internal.session.room.typing.TypingEventContent
 import org.matrix.android.sdk.internal.session.sync.SyncResponsePostTreatmentAggregator
 import org.matrix.android.sdk.internal.session.sync.parsing.RoomSyncAccountDataHandler
 import org.matrix.android.sdk.internal.util.computeBestChunkSize
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 import javax.inject.Inject
 
-internal class RoomSyncHandler @Inject constructor(private val readReceiptHandler: ReadReceiptHandler,
-                                                   private val roomSummaryUpdater: RoomSummaryUpdater,
-                                                   private val roomAccountDataHandler: RoomSyncAccountDataHandler,
-                                                   private val cryptoService: DefaultCryptoService,
-                                                   private val roomMemberEventHandler: RoomMemberEventHandler,
-                                                   private val roomTypingUsersHandler: RoomTypingUsersHandler,
-                                                   private val threadsAwarenessHandler: ThreadsAwarenessHandler,
-                                                   private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource,
-                                                   @UserId private val userId: String,
-                                                   private val homeServerCapabilitiesService: HomeServerCapabilitiesService,
-                                                   private val lightweightSettingsStorage: LightweightSettingsStorage,
-                                                   private val timelineInput: TimelineInput,
-                                                   private val liveEventService: Lazy<StreamEventsManager>) {
+internal class RoomSyncHandler @Inject constructor(
+        private val readReceiptHandler: ReadReceiptHandler,
+        private val roomSummaryUpdater: RoomSummaryUpdater,
+        private val roomAccountDataHandler: RoomSyncAccountDataHandler,
+        private val cryptoService: DefaultCryptoService,
+        private val roomMemberEventHandler: RoomMemberEventHandler,
+        private val roomTypingUsersHandler: RoomTypingUsersHandler,
+        private val threadsAwarenessHandler: ThreadsAwarenessHandler,
+        private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource,
+        @UserId private val userId: String,
+        private val homeServerCapabilitiesService: HomeServerCapabilitiesService,
+        private val lightweightSettingsStorage: LightweightSettingsStorage,
+        private val timelineInput: TimelineInput,
+        private val liveEventService: Lazy<StreamEventsManager>,
+        private val clock: Clock,
+) {
 
     sealed class HandlingStrategy {
         data class JOINED(val data: Map<String, RoomSync>) : HandlingStrategy()
@@ -102,11 +106,11 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         data class LEFT(val data: Map<String, RoomSync>) : HandlingStrategy()
     }
 
-    suspend fun handle(realm: Realm,
-                       roomsSyncResponse: RoomsSyncResponse,
-                       isInitialSync: Boolean,
-                       aggregator: SyncResponsePostTreatmentAggregator,
-                       reporter: ProgressReporter? = null) {
+    fun handle(realm: Realm,
+               roomsSyncResponse: RoomsSyncResponse,
+               isInitialSync: Boolean,
+               aggregator: SyncResponsePostTreatmentAggregator,
+               reporter: ProgressReporter? = null) {
         handleRoomSync(realm, HandlingStrategy.JOINED(roomsSyncResponse.join), isInitialSync, aggregator, reporter)
         handleRoomSync(realm, HandlingStrategy.INVITED(roomsSyncResponse.invite), isInitialSync, aggregator, reporter)
         handleRoomSync(realm, HandlingStrategy.LEFT(roomsSyncResponse.leave), isInitialSync, aggregator, reporter)
@@ -120,17 +124,17 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
     }
     // PRIVATE METHODS *****************************************************************************
 
-    private suspend fun handleRoomSync(realm: Realm,
-                                       handlingStrategy: HandlingStrategy,
-                                       isInitialSync: Boolean,
-                                       aggregator: SyncResponsePostTreatmentAggregator,
-                                       reporter: ProgressReporter?) {
+    private fun handleRoomSync(realm: Realm,
+                               handlingStrategy: HandlingStrategy,
+                               isInitialSync: Boolean,
+                               aggregator: SyncResponsePostTreatmentAggregator,
+                               reporter: ProgressReporter?) {
         val insertType = if (isInitialSync) {
             EventInsertType.INITIAL_SYNC
         } else {
             EventInsertType.INCREMENTAL_SYNC
         }
-        val syncLocalTimeStampMillis = System.currentTimeMillis()
+        val syncLocalTimeStampMillis = clock.epochMillis()
         val rooms = when (handlingStrategy) {
             is HandlingStrategy.JOINED  -> {
                 if (isInitialSync && initialSyncStrategy is InitialSyncStrategy.Optimized) {
@@ -157,11 +161,11 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         realm.insertOrUpdate(rooms)
     }
 
-    private suspend fun insertJoinRoomsFromInitSync(realm: Realm,
-                                                    handlingStrategy: HandlingStrategy.JOINED,
-                                                    syncLocalTimeStampMillis: Long,
-                                                    aggregator: SyncResponsePostTreatmentAggregator,
-                                                    reporter: ProgressReporter?) {
+    private fun insertJoinRoomsFromInitSync(realm: Realm,
+                                            handlingStrategy: HandlingStrategy.JOINED,
+                                            syncLocalTimeStampMillis: Long,
+                                            aggregator: SyncResponsePostTreatmentAggregator,
+                                            reporter: ProgressReporter?) {
         val bestChunkSize = computeBestChunkSize(
                 listSize = handlingStrategy.data.keys.size,
                 limit = (initialSyncStrategy as? InitialSyncStrategy.Optimized)?.maxRoomsToInsert ?: Int.MAX_VALUE
@@ -199,12 +203,12 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         }
     }
 
-    private suspend fun handleJoinedRoom(realm: Realm,
-                                         roomId: String,
-                                         roomSync: RoomSync,
-                                         insertType: EventInsertType,
-                                         syncLocalTimestampMillis: Long,
-                                         aggregator: SyncResponsePostTreatmentAggregator): RoomEntity {
+    private fun handleJoinedRoom(realm: Realm,
+                                 roomId: String,
+                                 roomSync: RoomSync,
+                                 insertType: EventInsertType,
+                                 syncLocalTimestampMillis: Long,
+                                 aggregator: SyncResponsePostTreatmentAggregator): RoomEntity {
         Timber.v("Handle join sync for room $roomId")
         val isInitialSync = insertType == EventInsertType.INITIAL_SYNC
 
@@ -353,15 +357,15 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         return roomEntity
     }
 
-    private suspend fun handleTimelineEvents(realm: Realm,
-                                             roomId: String,
-                                             roomEntity: RoomEntity,
-                                             eventList: List<Event>,
-                                             prevToken: String? = null,
-                                             isLimited: Boolean = true,
-                                             insertType: EventInsertType,
-                                             syncLocalTimestampMillis: Long,
-                                             aggregator: SyncResponsePostTreatmentAggregator): ChunkEntity {
+    private fun handleTimelineEvents(realm: Realm,
+                                     roomId: String,
+                                     roomEntity: RoomEntity,
+                                     eventList: List<Event>,
+                                     prevToken: String? = null,
+                                     isLimited: Boolean = true,
+                                     insertType: EventInsertType,
+                                     syncLocalTimestampMillis: Long,
+                                     aggregator: SyncResponsePostTreatmentAggregator): ChunkEntity {
         val lastChunk = ChunkEntity.findLastForwardChunkOfRoom(realm, roomEntity.roomId)
         if (isLimited && lastChunk != null) {
             lastChunk.deleteOnCascade(deleteStateEvents = false, canDeleteRoot = true)
@@ -389,8 +393,10 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
             liveEventService.get().dispatchLiveEventReceived(event, roomId, isInitialSync)
 
             if (event.isEncrypted() && !isInitialSync) {
-                runBlocking {
+                try {
                     decryptIfNeeded(event, roomId)
+                } catch (e: InterruptedException) {
+                    Timber.i("Decryption got interrupted")
                 }
             }
             var contentToInject: String? = null
@@ -421,7 +427,8 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                     roomId = roomId,
                     eventEntity = eventEntity,
                     direction = PaginationDirection.FORWARDS,
-                    roomMemberContentsByUser = roomMemberContentsByUser)
+                    roomMemberContentsByUser = roomMemberContentsByUser
+            )
             if (lightweightSettingsStorage.areThreadMessagesEnabled()) {
                 eventEntity.rootThreadEventId?.let {
                     // This is a thread event
@@ -437,7 +444,9 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                                 threadEventEntity = eventEntity,
                                 roomMemberContentsByUser = roomMemberContentsByUser,
                                 userId = userId,
-                                roomEntity = roomEntity)
+                                roomEntity = roomEntity,
+                                currentTimeMillis = clock.epochMillis(),
+                        )
                     }
                 } ?: run {
                     // This is a normal event or a root thread one
@@ -475,7 +484,8 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                     roomId = roomId,
                     realm = realm,
                     chunkEntity = chunkEntity,
-                    currentUserId = userId)
+                    currentUserId = userId
+            )
         }
 
         // posting new events to timeline if any is registered
@@ -505,10 +515,11 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         }
     }
 
-    private suspend fun decryptIfNeeded(event: Event, roomId: String) {
+    private fun decryptIfNeeded(event: Event, roomId: String) {
         try {
             // Event from sync does not have roomId, so add it to the event first
-            val result = cryptoService.decryptEvent(event.copy(roomId = roomId), "")
+            // note: runBlocking should be used here while we are in realm single thread executor, to avoid thread switching
+            val result = runBlocking { cryptoService.decryptEvent(event.copy(roomId = roomId), "") }
             event.mxDecryptionResult = OlmDecryptionResult(
                     payload = result.clearEvent,
                     senderKey = result.senderCurve25519Key,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ThreadsAwarenessHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ThreadsAwarenessHandler.kt
index efc8e39a18..7b7df57bc5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ThreadsAwarenessHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/ThreadsAwarenessHandler.kt
@@ -186,7 +186,8 @@ internal class ThreadsAwarenessHandler @Inject constructor(
                     eventBody = eventBody,
                     eventToInject = eventToInject,
                     eventToInjectBody = eventToInjectBody,
-                    threadRelation = threadRelation) ?: return null
+                    threadRelation = threadRelation
+            ) ?: return null
 
             // update the event
             contentForNonEncrypted = updateEventEntity(event, eventEntity, eventPayload, messageTextContent)
@@ -253,7 +254,8 @@ internal class ThreadsAwarenessHandler @Inject constructor(
                     eventBody = newEventBody,
                     eventToInject = event,
                     eventToInjectBody = eventBody,
-                    threadRelation = threadRelation) ?: return null
+                    threadRelation = threadRelation
+            ) ?: return null
 
             return updateEventEntity(newEventFound, eventEntityFound, newEventPayload, messageTextContent)
         }
@@ -309,7 +311,8 @@ internal class ThreadsAwarenessHandler @Inject constructor(
                 userLink,
                 eventIdToInjectSenderId,
                 eventToInjectBody,
-                eventBody)
+                eventBody
+        )
 
         return MessageTextContent(
                 relatesTo = threadRelation,
@@ -330,7 +333,8 @@ internal class ThreadsAwarenessHandler @Inject constructor(
                                         threadRelation: RelationDefaultContent?): String? {
         val replyFormatted = LocalEchoEventFactory.QUOTE_PATTERN.format(
                 "In reply to a thread",
-                eventBody)
+                eventBody
+        )
 
         val messageTextContent = MessageTextContent(
                 relatesTo = threadRelation,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
index c67c0e350e..f183c4cb28 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
@@ -42,7 +42,7 @@ private const val DEFAULT_DELAY_MILLIS = 30_000L
  * Possible next worker    : None
  */
 internal class SyncWorker(context: Context, workerParameters: WorkerParameters, sessionManager: SessionManager) :
-    SessionSafeCoroutineWorker<SyncWorker.Params>(context, workerParameters, sessionManager, Params::class.java) {
+        SessionSafeCoroutineWorker<SyncWorker.Params>(context, workerParameters, sessionManager, Params::class.java) {
 
     @JsonClass(generateAdapter = true)
     internal data class Params(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
index 5f62f40ab3..5d2fa0fc5c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
@@ -108,9 +108,11 @@ internal class DefaultTermsService @Inject constructor(
 
         val newList = listOfAcceptedTerms.toMutableSet().apply { addAll(agreedUrls) }.toList()
 
-        updateUserAccountDataTask.execute(UpdateUserAccountDataTask.AcceptedTermsParams(
-                acceptedTermsContent = AcceptedTermsContent(newList)
-        ))
+        updateUserAccountDataTask.execute(
+                UpdateUserAccountDataTask.AcceptedTermsParams(
+                        acceptedTermsContent = AcceptedTermsContent(newList)
+                )
+        )
     }
 
     private suspend fun getToken(url: String): String {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/DefaultThirdPartyService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/DefaultThirdPartyService.kt
index fdd5524fc2..210cb192e7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/DefaultThirdPartyService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/DefaultThirdPartyService.kt
@@ -23,7 +23,7 @@ import javax.inject.Inject
 
 internal class DefaultThirdPartyService @Inject constructor(private val getThirdPartyProtocolTask: GetThirdPartyProtocolsTask,
                                                             private val getThirdPartyUserTask: GetThirdPartyUserTask) :
-    ThirdPartyService {
+        ThirdPartyService {
 
     override suspend fun getThirdPartyProtocols(): Map<String, ThirdPartyProtocol> {
         return getThirdPartyProtocolTask.execute(Unit)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserModule.kt
index 4dfc7586ae..c205c4f1c6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserModule.kt
@@ -21,9 +21,7 @@ import dagger.Module
 import dagger.Provides
 import org.matrix.android.sdk.api.session.user.UserService
 import org.matrix.android.sdk.internal.session.SessionScope
-import org.matrix.android.sdk.internal.session.user.accountdata.DefaultSaveIgnoredUsersTask
 import org.matrix.android.sdk.internal.session.user.accountdata.DefaultUpdateIgnoredUserIdsTask
-import org.matrix.android.sdk.internal.session.user.accountdata.SaveIgnoredUsersTask
 import org.matrix.android.sdk.internal.session.user.accountdata.UpdateIgnoredUserIdsTask
 import org.matrix.android.sdk.internal.session.user.model.DefaultSearchUserTask
 import org.matrix.android.sdk.internal.session.user.model.SearchUserTask
@@ -48,9 +46,6 @@ internal abstract class UserModule {
     @Binds
     abstract fun bindSearchUserTask(task: DefaultSearchUserTask): SearchUserTask
 
-    @Binds
-    abstract fun bindSaveIgnoredUsersTask(task: DefaultSaveIgnoredUsersTask): SaveIgnoredUsersTask
-
     @Binds
     abstract fun bindUpdateIgnoredUserIdsTask(task: DefaultUpdateIgnoredUserIdsTask): UpdateIgnoredUserIdsTask
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/SaveIgnoredUsersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/SaveIgnoredUsersTask.kt
deleted file mode 100644
index 63c0ce645e..0000000000
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/SaveIgnoredUsersTask.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.matrix.android.sdk.internal.session.user.accountdata
-
-import com.zhuinden.monarchy.Monarchy
-import org.matrix.android.sdk.internal.database.model.IgnoredUserEntity
-import org.matrix.android.sdk.internal.di.SessionDatabase
-import org.matrix.android.sdk.internal.task.Task
-import org.matrix.android.sdk.internal.util.awaitTransaction
-import javax.inject.Inject
-
-/**
- * Save the ignored users list in DB
- */
-internal interface SaveIgnoredUsersTask : Task<SaveIgnoredUsersTask.Params, Unit> {
-    data class Params(
-            val userIds: List<String>
-    )
-}
-
-internal class DefaultSaveIgnoredUsersTask @Inject constructor(@SessionDatabase private val monarchy: Monarchy) : SaveIgnoredUsersTask {
-
-    override suspend fun execute(params: SaveIgnoredUsersTask.Params) {
-        monarchy.awaitTransaction { realm ->
-            // clear current ignored users
-            realm.where(IgnoredUserEntity::class.java)
-                    .findAll()
-                    .deleteAllFromRealm()
-
-            // And save the new received list
-            params.userIds.forEach { realm.createObject(IgnoredUserEntity::class.java).apply { userId = it } }
-        }
-    }
-}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateBreadcrumbsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateBreadcrumbsTask.kt
index 874c2741de..c4ea029cbb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateBreadcrumbsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateBreadcrumbsTask.kt
@@ -60,8 +60,10 @@ internal class DefaultUpdateBreadcrumbsTask @Inject constructor(
 
         // FIXME It can remove the previous breadcrumbs, if not synced yet
         // And update account data
-        updateUserAccountDataTask.execute(UpdateUserAccountDataTask.BreadcrumbsParams(
-                breadcrumbsContent = BreadcrumbsContent(newBreadcrumbs)
-        ))
+        updateUserAccountDataTask.execute(
+                UpdateUserAccountDataTask.BreadcrumbsParams(
+                        breadcrumbsContent = BreadcrumbsContent(newBreadcrumbs)
+                )
+        )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt
index 445b78104c..173161f8ae 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt
@@ -38,7 +38,6 @@ internal interface UpdateIgnoredUserIdsTask : Task<UpdateIgnoredUserIdsTask.Para
 internal class DefaultUpdateIgnoredUserIdsTask @Inject constructor(
         private val accountDataApi: AccountDataAPI,
         @SessionDatabase private val monarchy: Monarchy,
-        private val saveIgnoredUsersTask: SaveIgnoredUsersTask,
         @UserId private val userId: String,
         private val globalErrorReceiver: GlobalErrorReceiver
 ) : UpdateIgnoredUserIdsTask {
@@ -66,8 +65,5 @@ internal class DefaultUpdateIgnoredUserIdsTask @Inject constructor(
         executeRequest(globalErrorReceiver) {
             accountDataApi.setAccountData(userId, UserAccountDataTypes.TYPE_IGNORED_USER_LIST, body)
         }
-
-        // Update the DB right now (do not wait for the sync to come back with updated data, for a faster UI update)
-        saveIgnoredUsersTask.execute(SaveIgnoredUsersTask.Params(list))
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt
index 18a043be45..06508def1c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt
@@ -29,9 +29,10 @@ import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.room.RoomAPI
 import org.matrix.android.sdk.internal.task.Task
+import timber.log.Timber
 import javax.inject.Inject
 
-internal interface CreateWidgetTask : Task<CreateWidgetTask.Params, Unit> {
+internal interface CreateWidgetTask : Task<CreateWidgetTask.Params, String> {
 
     data class Params(
             val roomId: String,
@@ -45,8 +46,8 @@ internal class DefaultCreateWidgetTask @Inject constructor(@SessionDatabase priv
                                                            @UserId private val userId: String,
                                                            private val globalErrorReceiver: GlobalErrorReceiver) : CreateWidgetTask {
 
-    override suspend fun execute(params: CreateWidgetTask.Params) {
-        executeRequest(globalErrorReceiver) {
+    override suspend fun execute(params: CreateWidgetTask.Params): String {
+        val response = executeRequest(globalErrorReceiver) {
             roomAPI.sendStateEvent(
                     roomId = params.roomId,
                     stateEventType = EventType.STATE_ROOM_WIDGET_LEGACY,
@@ -60,5 +61,8 @@ internal class DefaultCreateWidgetTask @Inject constructor(@SessionDatabase priv
                     .and()
                     .equalTo(CurrentStateEventEntityFields.ROOT.SENDER, userId)
         }
+        return response.eventId.also {
+            Timber.d("Widget state event: $it just sent in room ${params.roomId}")
+        }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetPostAPIMediator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetPostAPIMediator.kt
index 10b4f7f7d7..9f42688f7d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetPostAPIMediator.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetPostAPIMediator.kt
@@ -29,7 +29,7 @@ import javax.inject.Inject
 
 internal class DefaultWidgetPostAPIMediator @Inject constructor(private val moshi: Moshi,
                                                                 private val widgetPostMessageAPIProvider: WidgetPostMessageAPIProvider) :
-    WidgetPostAPIMediator {
+        WidgetPostAPIMediator {
 
     private val jsonAdapter = moshi.adapter<JsonDict>(JSON_DICT_PARAMETERIZED_TYPE)
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt
index 89e827aea0..53a435d217 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt
@@ -29,7 +29,7 @@ import javax.inject.Provider
 internal class DefaultWidgetService @Inject constructor(private val widgetManager: WidgetManager,
                                                         private val widgetURLFormatter: WidgetURLFormatter,
                                                         private val widgetPostAPIMediator: Provider<WidgetPostAPIMediator>) :
-    WidgetService {
+        WidgetService {
 
     override fun getWidgetURLFormatter(): WidgetURLFormatter {
         return widgetURLFormatter
@@ -52,7 +52,7 @@ internal class DefaultWidgetService @Inject constructor(private val widgetManage
         return widgetManager.getWidgetComputedUrl(widget, isLightTheme)
     }
 
-override fun getRoomWidgetsLive(
+    override fun getRoomWidgetsLive(
             roomId: String,
             widgetId: QueryStringValue,
             widgetTypes: Set<String>?,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt
index e18117d2d7..07ed91c179 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt
@@ -52,7 +52,7 @@ internal class WidgetManager @Inject constructor(private val integrationManager:
                                                  private val widgetFactory: WidgetFactory,
                                                  @UserId private val userId: String) :
 
-    IntegrationManagerService.Listener, SessionLifecycleObserver {
+        IntegrationManagerService.Listener, SessionLifecycleObserver {
 
     private val lifecycleOwner: LifecycleOwner = LifecycleOwner { lifecycleRegistry }
     private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(lifecycleOwner)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt
index 6fd907d397..ffad0b856c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt
@@ -18,6 +18,7 @@ package org.matrix.android.sdk.internal.util
 
 import org.matrix.android.sdk.BuildConfig
 import org.matrix.android.sdk.api.logger.LoggerTag
+import org.matrix.android.sdk.internal.util.time.Clock
 import timber.log.Timber
 
 internal fun <T> Collection<T>.logLimit(maxQuantity: Int = 5): String {
@@ -34,13 +35,14 @@ internal fun <T> Collection<T>.logLimit(maxQuantity: Int = 5): String {
 
 internal suspend fun <T> logDuration(message: String,
                                      loggerTag: LoggerTag,
+                                     clock: Clock,
                                      block: suspend () -> T): T {
     Timber.tag(loggerTag.value).d("$message -- BEGIN")
-    val start = System.currentTimeMillis()
+    val start = clock.epochMillis()
     val result = logRamUsage(message) {
         block()
     }
-    val duration = System.currentTimeMillis() - start
+    val duration = clock.epochMillis() - start
     Timber.tag(loggerTag.value).d("$message -- END duration: $duration ms")
 
     return result
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/TemporaryFileCreator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/TemporaryFileCreator.kt
index 2790ffba36..dddd789212 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/TemporaryFileCreator.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/TemporaryFileCreator.kt
@@ -29,6 +29,7 @@ internal class TemporaryFileCreator @Inject constructor(
     suspend fun create(): File {
         return withContext(Dispatchers.IO) {
             File.createTempFile(UUID.randomUUID().toString(), null, context.cacheDir)
+                    .apply { mkdirs() }
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt
index f22f0810a1..8f3c89f2d4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/database/RealmMigrator.kt
@@ -21,7 +21,7 @@ import io.realm.RealmObjectSchema
 import timber.log.Timber
 
 internal abstract class RealmMigrator(private val realm: DynamicRealm,
-                             private val targetSchemaVersion: Int) {
+                                      private val targetSchemaVersion: Int) {
     fun perform() {
         Timber.d("Migrate ${realm.configuration.realmFileName} to $targetSchemaVersion")
         doMigrate(realm)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/system/DefaultBuildVersionSdkIntProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/system/DefaultBuildVersionSdkIntProvider.kt
index 2d5e4b944a..806c6e9735 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/system/DefaultBuildVersionSdkIntProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/system/DefaultBuildVersionSdkIntProvider.kt
@@ -20,6 +20,6 @@ import android.os.Build
 import javax.inject.Inject
 
 internal class DefaultBuildVersionSdkIntProvider @Inject constructor() :
-    BuildVersionSdkIntProvider {
+        BuildVersionSdkIntProvider {
     override fun get() = Build.VERSION.SDK_INT
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/system/SystemModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/system/SystemModule.kt
index 8a7b50175a..396d12f369 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/system/SystemModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/system/SystemModule.kt
@@ -18,10 +18,15 @@ package org.matrix.android.sdk.internal.util.system
 
 import dagger.Binds
 import dagger.Module
+import org.matrix.android.sdk.internal.util.time.Clock
+import org.matrix.android.sdk.internal.util.time.DefaultClock
 
 @Module
 internal abstract class SystemModule {
 
     @Binds
     abstract fun bindBuildVersionSdkIntProvider(provider: DefaultBuildVersionSdkIntProvider): BuildVersionSdkIntProvider
+
+    @Binds
+    abstract fun bindClock(clock: DefaultClock): Clock
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/time/Clock.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/time/Clock.kt
new file mode 100644
index 0000000000..4fe9069b49
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/time/Clock.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.util.time
+
+import javax.inject.Inject
+
+internal interface Clock {
+    fun epochMillis(): Long
+}
+
+internal class DefaultClock @Inject constructor() : Clock {
+
+    /**
+     * Provides a UTC epoch in milliseconds
+     *
+     * This value is not guaranteed to be correct with reality
+     * as a User can override the system time and date to any values.
+     */
+    override fun epochMillis(): Long {
+        return System.currentTimeMillis()
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt
index 82ff9a321f..a6b398f6f5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt
@@ -43,7 +43,7 @@ internal interface GetWellknownTask : Task<GetWellknownTask.Params, WellknownRes
              * the URL will be https://{domain}/.well-known/matrix/client
              */
             val domain: String,
-            val homeServerConnectionConfig: HomeServerConnectionConfig?
+            val homeServerConnectionConfig: HomeServerConnectionConfig
     )
 }
 
@@ -61,15 +61,11 @@ internal class DefaultGetWellknownTask @Inject constructor(
         return findClientConfig(params.domain, client)
     }
 
-    private fun buildClient(homeServerConnectionConfig: HomeServerConnectionConfig?): OkHttpClient {
-        return if (homeServerConnectionConfig != null) {
-            okHttpClient.get()
-                    .newBuilder()
-                    .addSocketFactory(homeServerConnectionConfig)
-                    .build()
-        } else {
-            okHttpClient.get()
-        }
+    private fun buildClient(homeServerConnectionConfig: HomeServerConnectionConfig): OkHttpClient {
+        return okHttpClient.get()
+                .newBuilder()
+                .addSocketFactory(homeServerConnectionConfig)
+                .build()
     }
 
     /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/AlwaysSuccessfulWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/AlwaysSuccessfulWorker.kt
index 856d3debcf..c92b51fcb8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/AlwaysSuccessfulWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/AlwaysSuccessfulWorker.kt
@@ -20,7 +20,7 @@ import androidx.work.Worker
 import androidx.work.WorkerParameters
 
 internal class AlwaysSuccessfulWorker(context: Context, params: WorkerParameters) :
-    Worker(context, params) {
+        Worker(context, params) {
 
     override fun doWork(): Result {
         return Result.success()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
index 0b451e9c34..6fce748091 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
@@ -93,12 +93,14 @@ internal class MatrixWorkerFactory @Inject constructor(private val sessionManage
     class CheckFactoryWorker(context: Context,
                              workerParameters: WorkerParameters,
                              private val isCreatedByMatrixWorkerFactory: Boolean) :
-        CoroutineWorker(context, workerParameters) {
+            CoroutineWorker(context, workerParameters) {
 
         // Called by WorkManager if there is no MatrixWorkerFactory
-        constructor(context: Context, workerParameters: WorkerParameters) : this(context,
+        constructor(context: Context, workerParameters: WorkerParameters) : this(
+                context,
                 workerParameters,
-                isCreatedByMatrixWorkerFactory = false)
+                isCreatedByMatrixWorkerFactory = false
+        )
 
         override suspend fun doWork(): Result {
             return if (!isCreatedByMatrixWorkerFactory) {
diff --git a/matrix-sdk-android/src/release/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt b/matrix-sdk-android/src/release/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt
index 47f6869479..0b7bac0d6f 100644
--- a/matrix-sdk-android/src/release/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt
+++ b/matrix-sdk-android/src/release/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt
@@ -27,7 +27,7 @@ import javax.inject.Inject
  */
 @MatrixScope
 internal class CurlLoggingInterceptor @Inject constructor() :
-    Interceptor {
+        Interceptor {
 
     @Throws(IOException::class)
     override fun intercept(chain: Interceptor.Chain): Response {
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushRuleActionsTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/session/pushrules/PushRuleActionsTest.kt
similarity index 95%
rename from matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushRuleActionsTest.kt
rename to matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/session/pushrules/PushRuleActionsTest.kt
index 9bfdea5414..1879e8195c 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushRuleActionsTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/session/pushrules/PushRuleActionsTest.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.api.pushrules
+package org.matrix.android.sdk.api.session.pushrules
 
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.matrix.android.sdk.MatrixTest
-import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
 import org.matrix.android.sdk.internal.di.MoshiProvider
 
 class PushRuleActionsTest : MatrixTest {
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushRulesConditionTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/session/pushrules/PushRulesConditionTest.kt
similarity index 91%
rename from matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushRulesConditionTest.kt
rename to matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/session/pushrules/PushRulesConditionTest.kt
index c0b869a90e..c4a3404e80 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushRulesConditionTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/session/pushrules/PushRulesConditionTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.api.pushrules
+package org.matrix.android.sdk.api.session.pushrules
 
 import io.mockk.every
 import io.mockk.mockk
@@ -26,6 +26,7 @@ import org.matrix.android.sdk.MatrixTest
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.members.MembershipService
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
@@ -42,7 +43,8 @@ class PushRulesConditionTest : MatrixTest {
                 type = "m.room.message",
                 eventId = "mx0",
                 content = MessageTextContent("m.text", text).toContent(),
-                originServerTs = 0)
+                originServerTs = 0
+        )
     }
 
     @Test
@@ -61,7 +63,8 @@ class PushRulesConditionTest : MatrixTest {
                 eventId = "mx0",
                 stateKey = "@foo:matrix.org",
                 content = rm.toContent(),
-                originServerTs = 0)
+                originServerTs = 0
+        )
 
         assert(condition.isSatisfied(simpleTextEvent))
         assert(!condition.isSatisfied(simpleRoomMemberEvent))
@@ -130,7 +133,8 @@ class PushRulesConditionTest : MatrixTest {
                 eventId = "mx0",
                 content = MessageTextContent("m.notice", "A").toContent(),
                 originServerTs = 0,
-                roomId = "2joined").also {
+                roomId = "2joined"
+        ).also {
             assertTrue("Notice", conditionEqual.isSatisfied(it))
         }
     }
@@ -148,14 +152,22 @@ class PushRulesConditionTest : MatrixTest {
         val room2JoinedId = "2joined"
         val room3JoinedId = "3joined"
 
-        val roomStub2Joined = mockk<Room> {
+        val roomMembershipService2 = mockk<MembershipService> {
             every { getNumberOfJoinedMembers() } returns 2
         }
 
-        val roomStub3Joined = mockk<Room> {
+        val roomMembershipService3 = mockk<MembershipService> {
             every { getNumberOfJoinedMembers() } returns 3
         }
 
+        val roomStub2Joined = mockk<Room> {
+            every { membershipService() } returns roomMembershipService2
+        }
+
+        val roomStub3Joined = mockk<Room> {
+            every { membershipService() } returns roomMembershipService3
+        }
+
         val roomGetterStub = mockk<RoomGetter> {
             every { getRoom(room2JoinedId) } returns roomStub2Joined
             every { getRoom(room3JoinedId) } returns roomStub3Joined
@@ -166,7 +178,8 @@ class PushRulesConditionTest : MatrixTest {
                 eventId = "mx0",
                 content = MessageTextContent("m.text", "A").toContent(),
                 originServerTs = 0,
-                roomId = room2JoinedId).also {
+                roomId = room2JoinedId
+        ).also {
             assertFalse("This room does not have 3 members", conditionEqual3.isSatisfied(it, roomGetterStub))
             assertFalse("This room does not have 3 members", conditionEqual3Bis.isSatisfied(it, roomGetterStub))
             assertTrue("This room has less than 3 members", conditionLessThan3.isSatisfied(it, roomGetterStub))
@@ -177,7 +190,8 @@ class PushRulesConditionTest : MatrixTest {
                 eventId = "mx0",
                 content = MessageTextContent("m.text", "A").toContent(),
                 originServerTs = 0,
-                roomId = room3JoinedId).also {
+                roomId = room3JoinedId
+        ).also {
             assertTrue("This room has 3 members", conditionEqual3.isSatisfied(it, roomGetterStub))
             assertTrue("This room has 3 members", conditionEqual3Bis.isSatisfied(it, roomGetterStub))
             assertFalse("This room has more than 3 members", conditionLessThan3.isSatisfied(it, roomGetterStub))
@@ -197,7 +211,8 @@ class PushRulesConditionTest : MatrixTest {
                 eventId = "mx0",
                 content = MessageTextContent("m.text", "How was the cake benoit?").toContent(),
                 originServerTs = 0,
-                roomId = "2joined")
+                roomId = "2joined"
+        )
 
         condition.isSatisfied(event, "how") shouldBe true
         condition.isSatisfied(event, "How") shouldBe true
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/Base58Test.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/Base58Test.kt
index a93883a344..e6fe8fbb00 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/Base58Test.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/Base58Test.kt
@@ -41,13 +41,17 @@ class Base58Test : MatrixTest {
     @Test
     fun encode_curve25519() {
         // Encode a 32 bytes key
-        assertEquals("4F85ZySpwyY6FuH7mQYyyr5b8nV9zFRBLj92AJa37sMr",
-                base58encode(("0123456789" + "0123456789" + "0123456789" + "01").toByteArray()))
+        assertEquals(
+                "4F85ZySpwyY6FuH7mQYyyr5b8nV9zFRBLj92AJa37sMr",
+                base58encode(("0123456789" + "0123456789" + "0123456789" + "01").toByteArray())
+        )
     }
 
     @Test
     fun decode_curve25519() {
-        assertArrayEquals(("0123456789" + "0123456789" + "0123456789" + "01").toByteArray(),
-                base58decode("4F85ZySpwyY6FuH7mQYyyr5b8nV9zFRBLj92AJa37sMr"))
+        assertArrayEquals(
+                ("0123456789" + "0123456789" + "0123456789" + "01").toByteArray(),
+                base58decode("4F85ZySpwyY6FuH7mQYyyr5b8nV9zFRBLj92AJa37sMr")
+        )
     }
 }
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/RecoveryKeyTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/RecoveryKeyTest.kt
index d4c9da2986..4146e6b3b7 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/RecoveryKeyTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/RecoveryKeyTest.kt
@@ -32,7 +32,8 @@ class RecoveryKeyTest : MatrixTest {
             0x77.toByte(), 0x07.toByte(), 0x6D.toByte(), 0x0A.toByte(), 0x73.toByte(), 0x18.toByte(), 0xA5.toByte(), 0x7D.toByte(),
             0x3C.toByte(), 0x16.toByte(), 0xC1.toByte(), 0x72.toByte(), 0x51.toByte(), 0xB2.toByte(), 0x66.toByte(), 0x45.toByte(),
             0xDF.toByte(), 0x4C.toByte(), 0x2F.toByte(), 0x87.toByte(), 0xEB.toByte(), 0xC0.toByte(), 0x99.toByte(), 0x2A.toByte(),
-            0xB1.toByte(), 0x77.toByte(), 0xFB.toByte(), 0xA5.toByte(), 0x1D.toByte(), 0xB9.toByte(), 0x2C.toByte(), 0x2A.toByte())
+            0xB1.toByte(), 0x77.toByte(), 0xFB.toByte(), 0xA5.toByte(), 0x1D.toByte(), 0xB9.toByte(), 0x2C.toByte(), 0x2A.toByte()
+    )
 
     @Test
     fun isValidRecoveryKey_valid_true() {
diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index 21ab0bab77..393e942b2a 100755
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -173,4 +173,7 @@ PreferenceManager\.getDefaultSharedPreferences==2
 # findViewById
 
 ### Do not use `template_` string. Please remove the prefix `template_` to use the generated resource instead.
-R\.string\.template_
\ No newline at end of file
+R\.string\.template_
+
+### Use the Clock interface, or use `measureTimeMillis`
+System\.currentTimeMillis\(\)===2
diff --git a/tools/hs_diag.py b/tools/hs_diag.py
index 50f117bc8e..8651321fa3 100755
--- a/tools/hs_diag.py
+++ b/tools/hs_diag.py
@@ -58,6 +58,9 @@ items = [
     # Need token , ["Capability", baseUrl + "_matrix/client/r0/capabilities", True]
     # Need token , ["Media config", baseUrl + "_matrix/media/r0/config", True]
     # Need token , ["Turn", baseUrl + "_matrix/client/r0/voip/turnServer", True]
+
+    # Only for Synapse
+    , ["Synapse version", baseUrl + "_synapse/admin/v1/server_version", True]
 ]
 
 for item in items:
diff --git a/vector-config/src/main/res/values/config-settings.xml b/vector-config/src/main/res/values/config-settings.xml
index b6d1c6676c..0a4da4c98e 100755
--- a/vector-config/src/main/res/values/config-settings.xml
+++ b/vector-config/src/main/res/values/config-settings.xml
@@ -13,7 +13,6 @@
     <bool name="settings_root_notification_visible">true</bool>
     <bool name="settings_root_preferences_visible">true</bool>
     <bool name="settings_root_voice_video_visible">true</bool>
-    <bool name="settings_root_ignored_users_visible">true</bool>
     <bool name="settings_root_security_privacy_visible">true</bool>
     <bool name="settings_root_labs_visible">true</bool>
     <bool name="settings_root_advanced_visible">true</bool>
@@ -33,10 +32,10 @@
 
     <!-- Level 1: Voice and video -->
 
-    <!-- Level 1: Ignored Users -->
-
     <!-- Level 1: Security and Privacy -->
 
+    <bool name="settings_ignored_users_visible">true</bool>
+
     <!-- Level 1: Labs -->
     <bool name="settings_labs_thread_messages_default">false</bool>
 
diff --git a/vector/build.gradle b/vector/build.gradle
index 6d318f82b9..cf5abf13f2 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -18,7 +18,7 @@ ext.versionMinor = 4
 // Note: even values are reserved for regular release, odd values for hotfix release.
 // When creating a hotfix, you should decrease the value, since the current value
 // is the value for the next regular release.
-ext.versionPatch = 12
+ext.versionPatch = 16
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'
@@ -343,11 +343,11 @@ dependencies {
     implementation libs.androidx.constraintLayout
     implementation "androidx.sharetarget:sharetarget:1.1.0"
     implementation libs.androidx.core
-    implementation "androidx.media:media:1.4.3"
+    implementation "androidx.media:media:1.6.0"
     implementation "androidx.transition:transition:1.4.1"
 
     implementation "org.threeten:threetenbp:1.4.0:no-tzdb"
-    implementation "com.gabrielittner.threetenbp:lazythreetenbp:0.9.0"
+    implementation "com.gabrielittner.threetenbp:lazythreetenbp:0.10.0"
 
     implementation libs.squareup.moshi
     kapt libs.squareup.moshiKotlin
@@ -368,7 +368,7 @@ dependencies {
     implementation 'com.facebook.stetho:stetho:1.6.0'
 
     // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.46'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.48'
 
     // FlowBinding
     implementation libs.github.flowBinding
@@ -412,10 +412,10 @@ dependencies {
     implementation 'androidx.browser:browser:1.4.0'
 
     // Passphrase strength helper
-    implementation 'com.nulab-inc:zxcvbn:1.5.2'
+    implementation 'com.nulab-inc:zxcvbn:1.7.0'
 
-    // To convert voice message on old platforms
-    implementation 'com.arthenica:ffmpeg-kit-audio:4.5.LTS'
+    // To convert voice message on old platforms. Always keep the LTS suffix!
+    implementation 'com.arthenica:ffmpeg-kit-audio:4.5.1.LTS'
 
     // Alerter
     implementation 'com.github.tapadoo:alerter:7.2.4'
@@ -462,7 +462,7 @@ dependencies {
     // OSS License, gplay flavor only
     gplayImplementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
 
-    implementation "androidx.emoji2:emoji2:1.0.1"
+    implementation "androidx.emoji2:emoji2:1.1.0"
 
     // WebRTC
     // org.webrtc:google-webrtc is for development purposes only
diff --git a/vector/src/androidTest/java/im/vector/app/EspressoExt.kt b/vector/src/androidTest/java/im/vector/app/EspressoExt.kt
index 5fb404efe3..efb28cdff5 100644
--- a/vector/src/androidTest/java/im/vector/app/EspressoExt.kt
+++ b/vector/src/androidTest/java/im/vector/app/EspressoExt.kt
@@ -43,6 +43,7 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.core.time.DefaultClock
 import im.vector.app.espresso.tools.waitUntilViewVisible
 import org.hamcrest.Matcher
 import org.hamcrest.Matchers
@@ -52,6 +53,7 @@ import org.matrix.android.sdk.api.session.crypto.crosssigning.PrivateKeysInfo
 import org.matrix.android.sdk.api.session.sync.SyncState
 import org.matrix.android.sdk.api.util.Optional
 import java.util.concurrent.TimeoutException
+import kotlin.random.Random
 
 object EspressoHelper {
     fun getCurrentActivity(): Activity? {
@@ -89,6 +91,8 @@ fun getString(@StringRes id: Int): String {
 
 fun waitForView(viewMatcher: Matcher<View>, timeout: Long = 10_000, waitForDisplayed: Boolean = true): ViewAction {
     return object : ViewAction {
+        private val clock = DefaultClock()
+
         override fun getConstraints(): Matcher<View> {
             return Matchers.any(View::class.java)
         }
@@ -102,14 +106,14 @@ fun waitForView(viewMatcher: Matcher<View>, timeout: Long = 10_000, waitForDispl
         override fun perform(uiController: UiController, view: View) {
             println("*** waitForView 1 $view")
             uiController.loopMainThreadUntilIdle()
-            val startTime = System.currentTimeMillis()
+            val startTime = clock.epochMillis()
             val endTime = startTime + timeout
             val visibleMatcher = isDisplayed()
 
             uiController.loopMainThreadForAtLeast(100)
 
             do {
-                println("*** waitForView loop $view end:$endTime current:${System.currentTimeMillis()}")
+                println("*** waitForView loop $view end:$endTime current:${clock.epochMillis()}")
                 val viewVisible = TreeIterables.breadthFirstViewTraversal(view)
                         .any { viewMatcher.matches(it) && visibleMatcher.matches(it) }
 
@@ -118,7 +122,7 @@ fun waitForView(viewMatcher: Matcher<View>, timeout: Long = 10_000, waitForDispl
                 println("*** waitForView loop loopMainThreadForAtLeast...")
                 uiController.loopMainThreadForAtLeast(50)
                 println("*** waitForView loop ...loopMainThreadForAtLeast")
-            } while (System.currentTimeMillis() < endTime)
+            } while (clock.epochMillis() < endTime)
 
             println("*** waitForView timeout $view")
             // Timeout happens.
@@ -168,9 +172,9 @@ fun activityIdlingResource(activityClass: Class<*>): IdlingResource {
     val res = object : IdlingResource, ActivityLifecycleCallback {
         private var callback: IdlingResource.ResourceCallback? = null
         private var resumedActivity: Activity? = null
-        private val uniqTS = System.currentTimeMillis()
+        private val uniqueSuffix = Random.nextLong()
 
-        override fun getName() = "activityIdlingResource_${activityClass.name}_$uniqTS"
+        override fun getName() = "activityIdlingResource_${activityClass.name}_$uniqueSuffix"
 
         override fun isIdleNow(): Boolean {
             val activity = resumedActivity ?: ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(Stage.RESUMED).firstOrNull {
@@ -198,7 +202,7 @@ fun activityIdlingResource(activityClass: Class<*>): IdlingResource {
                         println("*** [$name]  onActivityLifecycleChanged callback: $callback")
                         callback?.onTransitionToIdle()
                     }
-                    else -> {
+                    else          -> {
                         // do nothing, we're blocking until the activity resumes
                     }
                 }
diff --git a/vector/src/androidTest/java/im/vector/app/RegistrationTest.kt b/vector/src/androidTest/java/im/vector/app/RegistrationTest.kt
index fcec2a9fb5..344a2ecfb1 100644
--- a/vector/src/androidTest/java/im/vector/app/RegistrationTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/RegistrationTest.kt
@@ -34,6 +34,7 @@ import org.hamcrest.CoreMatchers.not
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import kotlin.random.Random
 
 @RunWith(AndroidJUnit4::class)
 @LargeTest
@@ -44,7 +45,7 @@ class RegistrationTest {
 
     @Test
     fun simpleRegister() {
-        val userId: String = "UiAutoTest_${System.currentTimeMillis()}"
+        val userId: String = "UiAutoTest_${Random.nextLong()}"
         val password: String = "password"
         val homeServerUrl: String = "http://10.0.2.2:8080"
 
diff --git a/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt b/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
index 69fe63fb7b..21fd226317 100644
--- a/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
@@ -48,6 +48,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.matrix.android.sdk.api.session.Session
+import kotlin.random.Random
 
 @RunWith(AndroidJUnit4::class)
 @LargeTest
@@ -61,7 +62,7 @@ class SecurityBootstrapTest : VerificationTestBase() {
     @Before
     fun createSessionWithCrossSigning() {
         val matrix = getMatrixInstance()
-        val userName = "foobar_${System.currentTimeMillis()}"
+        val userName = "foobar_${Random.nextLong()}"
         existingSession = createAccountAndSync(matrix, userName, password, true)
         stubAllExternalIntents()
     }
@@ -166,7 +167,7 @@ class SecurityBootstrapTest : VerificationTestBase() {
         assert(uiSession.cryptoService().crossSigningService().allPrivateKeysKnown())
         assert(uiSession.cryptoService().keysBackupService().isEnabled)
         assert(uiSession.cryptoService().keysBackupService().currentBackupVersion != null)
-        assert(uiSession.sharedSecretStorageService.isRecoverySetup())
-        assert(uiSession.sharedSecretStorageService.isMegolmKeyInBackup())
+        assert(uiSession.sharedSecretStorageService().isRecoverySetup())
+        assert(uiSession.sharedSecretStorageService().isMegolmKeyInBackup())
     }
 }
diff --git a/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt b/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
index c82b543a08..c970d0049f 100644
--- a/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
@@ -53,6 +53,7 @@ import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransa
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
+import kotlin.random.Random
 
 @RunWith(AndroidJUnit4::class)
 @LargeTest
@@ -66,7 +67,7 @@ class VerifySessionInteractiveTest : VerificationTestBase() {
     @Before
     fun createSessionWithCrossSigning() {
         val matrix = getMatrixInstance()
-        val userName = "foobar_${System.currentTimeMillis()}"
+        val userName = "foobar_${Random.nextLong()}"
         existingSession = createAccountAndSync(matrix, userName, password, true)
         doSync<Unit> {
             existingSession!!.cryptoService().crossSigningService()
@@ -81,7 +82,8 @@ class VerifySessionInteractiveTest : VerificationTestBase() {
                                             )
                                     )
                                 }
-                            }, it)
+                            }, it
+                    )
         }
     }
 
diff --git a/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt b/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt
index 80d8315a0e..7efae073e5 100644
--- a/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt
@@ -53,6 +53,7 @@ import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
 import org.matrix.android.sdk.api.session.Session
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
+import kotlin.random.Random
 
 @RunWith(AndroidJUnit4::class)
 @LargeTest
@@ -68,7 +69,7 @@ class VerifySessionPassphraseTest : VerificationTestBase() {
     fun createSessionWithCrossSigningAnd4S() {
         val context = InstrumentationRegistry.getInstrumentation().targetContext
         val matrix = getMatrixInstance()
-        val userName = "foobar_${System.currentTimeMillis()}"
+        val userName = "foobar_${Random.nextLong()}"
         existingSession = createAccountAndSync(matrix, userName, password, true)
         doSync<Unit> {
             existingSession!!.cryptoService().crossSigningService()
@@ -83,27 +84,30 @@ class VerifySessionPassphraseTest : VerificationTestBase() {
                                             )
                                     )
                                 }
-                            }, it)
+                            }, it
+                    )
         }
 
         val task = BootstrapCrossSigningTask(existingSession!!, StringProvider(context.resources))
 
         runBlocking {
-            task.execute(Params(
-                    userInteractiveAuthInterceptor = object : UserInteractiveAuthInterceptor {
-                        override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
-                            promise.resume(
-                                    UserPasswordAuth(
-                                            user = existingSession!!.myUserId,
-                                            password = password,
-                                            session = flowResponse.session
+            task.execute(
+                    Params(
+                            userInteractiveAuthInterceptor = object : UserInteractiveAuthInterceptor {
+                                override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
+                                    promise.resume(
+                                            UserPasswordAuth(
+                                                    user = existingSession!!.myUserId,
+                                                    password = password,
+                                                    session = flowResponse.session
+                                            )
                                     )
-                            )
-                        }
-                    },
-                    passphrase = passphrase,
-                    setupMode = SetupMode.NORMAL
-            ))
+                                }
+                            },
+                            passphrase = passphrase,
+                            setupMode = SetupMode.NORMAL
+                    )
+            )
         }
     }
 
diff --git a/vector/src/androidTest/java/im/vector/app/espresso/tools/EspressoPreference.kt b/vector/src/androidTest/java/im/vector/app/espresso/tools/EspressoPreference.kt
index 178b9fb9f6..19dc1d391c 100644
--- a/vector/src/androidTest/java/im/vector/app/espresso/tools/EspressoPreference.kt
+++ b/vector/src/androidTest/java/im/vector/app/espresso/tools/EspressoPreference.kt
@@ -26,6 +26,7 @@ import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItem
 import androidx.test.espresso.matcher.PreferenceMatchers.withKey
 import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
+import androidx.test.espresso.matcher.ViewMatchers.isFocusable
 import androidx.test.espresso.matcher.ViewMatchers.withClassName
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
@@ -36,8 +37,15 @@ import org.hamcrest.Matchers.`is`
 
 fun clickOnPreference(@StringRes textResId: Int) {
     onView(withId(R.id.recycler_view))
-            .perform(actionOnItem<RecyclerView.ViewHolder>(
-                    hasDescendant(withText(textResId)), click()))
+            .perform(
+                    actionOnItem<RecyclerView.ViewHolder>(
+                            allOf(
+                                    hasDescendant(withText(textResId)),
+                                    // Avoid to click on the Preference Category
+                                    isFocusable()
+                            ), click()
+                    )
+            )
 }
 
 fun clickOnSwitchPreference(preferenceKey: String) {
diff --git a/vector/src/androidTest/java/im/vector/app/espresso/tools/ScreenshotFailureRule.kt b/vector/src/androidTest/java/im/vector/app/espresso/tools/ScreenshotFailureRule.kt
index 2939dcf4e0..b01c1a895f 100644
--- a/vector/src/androidTest/java/im/vector/app/espresso/tools/ScreenshotFailureRule.kt
+++ b/vector/src/androidTest/java/im/vector/app/espresso/tools/ScreenshotFailureRule.kt
@@ -24,6 +24,7 @@ import android.os.Build
 import android.os.Environment
 import android.provider.MediaStore
 import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
+import im.vector.app.core.time.DefaultClock
 import org.junit.rules.TestWatcher
 import org.junit.runner.Description
 import timber.log.Timber
@@ -54,7 +55,7 @@ private fun storeFailureScreenshot(bitmap: Bitmap, screenshotName: String) {
 
     val contentValues = ContentValues().apply {
         put(MediaStore.Images.Media.MIME_TYPE, "image/jpeg")
-        put(MediaStore.Images.Media.DATE_TAKEN, System.currentTimeMillis())
+        put(MediaStore.Images.Media.DATE_TAKEN, DefaultClock().epochMillis())
     }
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
         useMediaStoreScreenshotStorage(
diff --git a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt b/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
index 5a03d5890a..4333558e7a 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
@@ -72,7 +72,6 @@ class UiAllScreensSanityTest {
             notifications { crawl() }
             preferences { crawl() }
             voiceAndVideo()
-            ignoredUsers()
             securityAndPrivacy { crawl() }
             labs()
             advancedSettings { crawl() }
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/MessageMenuRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/MessageMenuRobot.kt
index 5c9ecfdef5..53ad2af7e6 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/MessageMenuRobot.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/MessageMenuRobot.kt
@@ -75,6 +75,7 @@ class MessageMenuRobot(
         clickOn(R.string.reply_in_thread)
         autoClosed = true
     }
+
     fun viewInRoom() {
         clickOn(R.string.view_in_room)
         autoClosed = true
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/RoomDetailRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/RoomDetailRobot.kt
index 0ea1191fba..91409582d9 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/RoomDetailRobot.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/RoomDetailRobot.kt
@@ -56,10 +56,8 @@ class RoomDetailRobot {
         // Menu
         openMenu()
         pressBack()
-        /* TODO something has changed in the menu :/
         clickMenu(R.id.voice_call)
         pressBack()
-         */
         clickMenu(R.id.video_call)
         pressBack()
     }
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsRobot.kt
index 97aee7ac4a..1697fe078d 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsRobot.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsRobot.kt
@@ -44,15 +44,11 @@ class SettingsRobot {
         clickOnAndGoBack(R.string.preference_voice_and_video) { block() }
     }
 
-    fun ignoredUsers(block: () -> Unit = {}) {
-        clickOnAndGoBack(R.string.settings_ignored_users) { block() }
-    }
-
     fun securityAndPrivacy(block: SettingsSecurityRobot.() -> Unit) {
         clickOnAndGoBack(R.string.settings_security_and_privacy) { block(SettingsSecurityRobot()) }
     }
 
-    fun labs(shouldGoBack: Boolean = true, block:  () -> Unit = {}) {
+    fun labs(shouldGoBack: Boolean = true, block: () -> Unit = {}) {
         if (shouldGoBack) {
             clickOnAndGoBack(R.string.room_settings_labs_pref_title) { block() }
         } else {
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsSecurityRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsSecurityRobot.kt
index 168db3e0e9..841c99e1b5 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsSecurityRobot.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsSecurityRobot.kt
@@ -36,5 +36,8 @@ class SettingsSecurityRobot {
 
         clickOnPreference(R.string.settings_opt_in_of_analytics)
         Espresso.pressBack()
+
+        clickOnPreference(R.string.settings_ignored_users)
+        Espresso.pressBack()
     }
 }
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
index cc69cfd426..d407fcb1f2 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
@@ -29,6 +29,7 @@ import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.time.Clock
 import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
 import im.vector.app.core.utils.checkPermissions
 import im.vector.app.core.utils.registerForPermissionsResult
@@ -60,6 +61,9 @@ class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
     @Inject
     lateinit var activeSessionHolder: ActiveSessionHolder
 
+    @Inject
+    lateinit var clock: Clock
+
     private lateinit var buffer: ByteArray
 
     override fun initUiAndData() {
@@ -165,7 +169,7 @@ class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
         }
 
         val builder = NotificationCompat.Builder(this, "CHAN")
-                .setWhen(System.currentTimeMillis())
+                .setWhen(clock.epochMillis())
                 .setContentTitle("Title")
                 .setContentText("Content")
                 // No effect because it's a group summary notif
@@ -180,16 +184,16 @@ class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
                         .setName("User name")
                         .build()
         )
-                .addMessage("Message 1 - 1", System.currentTimeMillis(), Person.Builder().setName("user 1-1").build())
-                .addMessage("Message 1 - 2", System.currentTimeMillis(), Person.Builder().setName("user 1-2").build())
+                .addMessage("Message 1 - 1", clock.epochMillis(), Person.Builder().setName("user 1-1").build())
+                .addMessage("Message 1 - 2", clock.epochMillis(), Person.Builder().setName("user 1-2").build())
 
         val messagingStyle2 = NotificationCompat.MessagingStyle(
                 Person.Builder()
                         .setName("User name 2")
                         .build()
         )
-                .addMessage("Message 2 - 1", System.currentTimeMillis(), Person.Builder().setName("user 1-1").build())
-                .addMessage("Message 2 - 2", System.currentTimeMillis(), Person.Builder().setName("user 1-2").build())
+                .addMessage("Message 2 - 1", clock.epochMillis(), Person.Builder().setName("user 1-1").build())
+                .addMessage("Message 2 - 2", clock.epochMillis(), Person.Builder().setName("user 1-2").build())
 
         notificationManager.notify(10, builder.build())
 
@@ -197,7 +201,7 @@ class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
                 11,
                 NotificationCompat.Builder(this, "CHAN")
                         .setChannelId("CHAN")
-                        .setWhen(System.currentTimeMillis())
+                        .setWhen(clock.epochMillis())
                         .setContentTitle("Title 1")
                         .setContentText("Content 1")
                         // For shortcut on long press on launcher icon
@@ -211,7 +215,7 @@ class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
         notificationManager.notify(
                 12,
                 NotificationCompat.Builder(this, "CHAN2")
-                        .setWhen(System.currentTimeMillis())
+                        .setWhen(clock.epochMillis())
                         .setContentTitle("Title 2")
                         .setContentText("Content 2")
                         .setStyle(messagingStyle2)
@@ -243,8 +247,10 @@ class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
 
     private val qrStartForActivityResult = registerStartForActivityResult { activityResult ->
         if (activityResult.resultCode == Activity.RESULT_OK) {
-            toast("QrCode: " + QrCodeScannerActivity.getResultText(activityResult.data) +
-                    " is QRCode: " + QrCodeScannerActivity.getResultIsQrCode(activityResult.data))
+            toast(
+                    "QrCode: " + QrCodeScannerActivity.getResultText(activityResult.data) +
+                            " is QRCode: " + QrCodeScannerActivity.getResultIsQrCode(activityResult.data)
+            )
 
             // Also update the current QR Code (reverse operation)
             // renderQrCode(QrCodeScannerActivity.getResultText(data) ?: "")
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt
index a35bb40f8f..0f00f2daa5 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt
@@ -45,7 +45,8 @@ class DebugPermissionActivity : VectorBaseActivity<ActivityDebugPermissionBindin
             Manifest.permission.RECORD_AUDIO,
             Manifest.permission.WRITE_EXTERNAL_STORAGE,
             Manifest.permission.READ_EXTERNAL_STORAGE,
-            Manifest.permission.READ_CONTACTS)
+            Manifest.permission.READ_CONTACTS
+    )
 
     private var lastPermissions = emptyList<String>()
 
diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt b/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
index 5b3ee30722..f2904e4b1a 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
@@ -28,43 +28,45 @@ class DebugFeaturesStateFactory @Inject constructor(
 ) {
 
     fun create(): FeaturesState {
-        return FeaturesState(listOf(
-                createEnumFeature(
-                        label = "Onboarding variant",
-                        featureOverride = debugFeatures.onboardingVariant(),
-                        featureDefault = defaultFeatures.onboardingVariant()
-                ),
-                createBooleanFeature(
-                        label = "FTUE Splash - I already have an account",
-                        key = DebugFeatureKeys.onboardingAlreadyHaveAnAccount,
-                        factory = VectorFeatures::isOnboardingAlreadyHaveAccountSplashEnabled
-                ),
-                createBooleanFeature(
-                        label = "FTUE Splash - carousel",
-                        key = DebugFeatureKeys.onboardingSplashCarousel,
-                        factory = VectorFeatures::isOnboardingSplashCarouselEnabled
-                ),
-                createBooleanFeature(
-                        label = "FTUE Use Case",
-                        key = DebugFeatureKeys.onboardingUseCase,
-                        factory = VectorFeatures::isOnboardingUseCaseEnabled
-                ),
-                createBooleanFeature(
-                        label = "FTUE Personalize profile",
-                        key = DebugFeatureKeys.onboardingPersonalize,
-                        factory = VectorFeatures::isOnboardingPersonalizeEnabled
-                ),
-                createBooleanFeature(
-                        label = "FTUE Combined register",
-                        key = DebugFeatureKeys.onboardingCombinedRegister,
-                        factory = VectorFeatures::isOnboardingCombinedRegisterEnabled
-                ),
-                createBooleanFeature(
-                        label = "Live location sharing",
-                        key = DebugFeatureKeys.liveLocationSharing,
-                        factory = VectorFeatures::isLiveLocationEnabled
-                ),
-        ))
+        return FeaturesState(
+                listOf(
+                        createEnumFeature(
+                                label = "Onboarding variant",
+                                featureOverride = debugFeatures.onboardingVariant(),
+                                featureDefault = defaultFeatures.onboardingVariant()
+                        ),
+                        createBooleanFeature(
+                                label = "FTUE Splash - I already have an account",
+                                key = DebugFeatureKeys.onboardingAlreadyHaveAnAccount,
+                                factory = VectorFeatures::isOnboardingAlreadyHaveAccountSplashEnabled
+                        ),
+                        createBooleanFeature(
+                                label = "FTUE Splash - carousel",
+                                key = DebugFeatureKeys.onboardingSplashCarousel,
+                                factory = VectorFeatures::isOnboardingSplashCarouselEnabled
+                        ),
+                        createBooleanFeature(
+                                label = "FTUE Use Case",
+                                key = DebugFeatureKeys.onboardingUseCase,
+                                factory = VectorFeatures::isOnboardingUseCaseEnabled
+                        ),
+                        createBooleanFeature(
+                                label = "FTUE Personalize profile",
+                                key = DebugFeatureKeys.onboardingPersonalize,
+                                factory = VectorFeatures::isOnboardingPersonalizeEnabled
+                        ),
+                        createBooleanFeature(
+                                label = "FTUE Combined register",
+                                key = DebugFeatureKeys.onboardingCombinedRegister,
+                                factory = VectorFeatures::isOnboardingCombinedRegisterEnabled
+                        ),
+                        createBooleanFeature(
+                                label = "Live location sharing",
+                                key = DebugFeatureKeys.liveLocationSharing,
+                                factory = VectorFeatures::isLiveLocationEnabled
+                        ),
+                )
+        )
     }
 
     private fun createBooleanFeature(key: Preferences.Key<Boolean>, label: String, factory: KFunction1<VectorFeatures, Boolean>): Feature {
diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt b/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
index bc716779ac..07fab8a58d 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
@@ -60,6 +60,9 @@ class DebugVectorFeatures(
     override fun isLiveLocationEnabled(): Boolean = read(DebugFeatureKeys.liveLocationSharing)
             ?: vectorFeatures.isLiveLocationEnabled()
 
+    override fun isScreenSharingEnabled(): Boolean = read(DebugFeatureKeys.screenSharing)
+            ?: vectorFeatures.isScreenSharingEnabled()
+
     fun <T> override(value: T?, key: Preferences.Key<T>) = updatePreferences {
         if (value == null) {
             it.remove(key)
@@ -114,4 +117,5 @@ object DebugFeatureKeys {
     val onboardingPersonalize = booleanPreferencesKey("onboarding-personalize")
     val onboardingCombinedRegister = booleanPreferencesKey("onboarding-combined-register")
     val liveLocationSharing = booleanPreferencesKey("live-location-sharing")
+    val screenSharing = booleanPreferencesKey("screen-sharing")
 }
diff --git a/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt b/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt
index a7b74f3b59..9e0c013960 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt
@@ -32,6 +32,7 @@ abstract class SasEmojiItem : VectorEpoxyModel<SasEmojiItem.Holder>() {
 
     @EpoxyAttribute
     var index: Int = 0
+
     @EpoxyAttribute
     lateinit var emojiRepresentation: EmojiRepresentation
 
diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt
index 1d77d031af..dfe412117f 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt
@@ -57,10 +57,12 @@ class DebugPrivateSettingsViewModel @AssistedInject constructor(
         debugVectorOverrides.forceHomeserverCapabilities.setOnEach {
             val activeDisplayNameOption = BooleanHomeserverCapabilitiesOverride.from(it.canChangeDisplayName)
             val activeAvatarOption = BooleanHomeserverCapabilitiesOverride.from(it.canChangeAvatar)
-            copy(homeserverCapabilityOverrides = homeserverCapabilityOverrides.copy(
-                    displayName = homeserverCapabilityOverrides.displayName.copy(activeOption = activeDisplayNameOption),
-                    avatar = homeserverCapabilityOverrides.avatar.copy(activeOption = activeAvatarOption),
-            ))
+            copy(
+                    homeserverCapabilityOverrides = homeserverCapabilityOverrides.copy(
+                            displayName = homeserverCapabilityOverrides.displayName.copy(activeOption = activeDisplayNameOption),
+                            avatar = homeserverCapabilityOverrides.avatar.copy(activeOption = activeAvatarOption),
+                    )
+            )
         }
     }
 
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt b/vector/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt
index 0fe89e7fe5..e890180c4f 100644
--- a/vector/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt
+++ b/vector/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt
@@ -18,13 +18,17 @@ package im.vector.app.fdroid
 
 import android.content.Context
 import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.time.Clock
 import im.vector.app.fdroid.receiver.AlarmSyncBroadcastReceiver
 import im.vector.app.features.settings.BackgroundSyncMode
 import im.vector.app.features.settings.VectorPreferences
 import timber.log.Timber
 
 object BackgroundSyncStarter {
-    fun start(context: Context, vectorPreferences: VectorPreferences, activeSessionHolder: ActiveSessionHolder) {
+    fun start(context: Context,
+              vectorPreferences: VectorPreferences,
+              activeSessionHolder: ActiveSessionHolder,
+              clock: Clock) {
         if (vectorPreferences.areNotificationEnabledForDevice()) {
             val activeSession = activeSessionHolder.getSafeActiveSession() ?: return
             when (vectorPreferences.getFdroidSyncBackgroundMode()) {
@@ -38,7 +42,12 @@ object BackgroundSyncStarter {
                 }
                 BackgroundSyncMode.FDROID_BACKGROUND_SYNC_MODE_FOR_REALTIME -> {
                     // We need to use alarm in this mode
-                    AlarmSyncBroadcastReceiver.scheduleAlarm(context, activeSession.sessionId, vectorPreferences.backgroundSyncDelay())
+                    AlarmSyncBroadcastReceiver.scheduleAlarm(
+                            context,
+                            activeSession.sessionId,
+                            vectorPreferences.backgroundSyncDelay(),
+                            clock
+                    )
                     Timber.i("## Sync: Alarm scheduled to start syncing")
                 }
                 BackgroundSyncMode.FDROID_BACKGROUND_SYNC_MODE_DISABLED     -> {
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
index 27a3f09ddc..6d741a36ba 100644
--- a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
+++ b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
@@ -28,7 +28,7 @@ import javax.inject.Inject
  */
 class TestAutoStartBoot @Inject constructor(private val vectorPreferences: VectorPreferences,
                                             private val stringProvider: StringProvider) :
-    TroubleshootTest(R.string.settings_troubleshoot_test_service_boot_title) {
+        TroubleshootTest(R.string.settings_troubleshoot_test_service_boot_title) {
 
     override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         if (vectorPreferences.autoStartOnBoot()) {
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
index b5635e186c..5932d2c372 100644
--- a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
+++ b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
@@ -28,7 +28,7 @@ import javax.inject.Inject
 
 class TestBackgroundRestrictions @Inject constructor(private val context: FragmentActivity,
                                                      private val stringProvider: StringProvider) :
-    TroubleshootTest(R.string.settings_troubleshoot_test_bg_restricted_title) {
+        TroubleshootTest(R.string.settings_troubleshoot_test_bg_restricted_title) {
 
     override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         context.getSystemService<ConnectivityManager>()!!.apply {
@@ -39,24 +39,30 @@ class TestBackgroundRestrictions @Inject constructor(private val context: Fragme
                     ConnectivityManagerCompat.RESTRICT_BACKGROUND_STATUS_ENABLED     -> {
                         // Background data usage is blocked for this app. Wherever possible,
                         // the app should also use less data in the foreground.
-                        description = stringProvider.getString(R.string.settings_troubleshoot_test_bg_restricted_failed,
-                                "RESTRICT_BACKGROUND_STATUS_ENABLED")
+                        description = stringProvider.getString(
+                                R.string.settings_troubleshoot_test_bg_restricted_failed,
+                                "RESTRICT_BACKGROUND_STATUS_ENABLED"
+                        )
                         status = TestStatus.FAILED
                         quickFix = null
                     }
                     ConnectivityManagerCompat.RESTRICT_BACKGROUND_STATUS_WHITELISTED -> {
                         // The app is whitelisted. Wherever possible,
                         // the app should use less data in the foreground and background.
-                        description = stringProvider.getString(R.string.settings_troubleshoot_test_bg_restricted_success,
-                                "RESTRICT_BACKGROUND_STATUS_WHITELISTED")
+                        description = stringProvider.getString(
+                                R.string.settings_troubleshoot_test_bg_restricted_success,
+                                "RESTRICT_BACKGROUND_STATUS_WHITELISTED"
+                        )
                         status = TestStatus.SUCCESS
                         quickFix = null
                     }
                     ConnectivityManagerCompat.RESTRICT_BACKGROUND_STATUS_DISABLED    -> {
                         // Data Saver is disabled. Since the device is connected to a
                         // metered network, the app should use less data wherever possible.
-                        description = stringProvider.getString(R.string.settings_troubleshoot_test_bg_restricted_success,
-                                "RESTRICT_BACKGROUND_STATUS_DISABLED")
+                        description = stringProvider.getString(
+                                R.string.settings_troubleshoot_test_bg_restricted_success,
+                                "RESTRICT_BACKGROUND_STATUS_DISABLED"
+                        )
                         status = TestStatus.SUCCESS
                         quickFix = null
                     }
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt
index a5154c7483..57bdf721a2 100644
--- a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt
+++ b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt
@@ -31,7 +31,7 @@ class TestBatteryOptimization @Inject constructor(
 ) : TroubleshootTest(R.string.settings_troubleshoot_test_battery_title) {
 
     override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
-        if (isIgnoringBatteryOptimizations(context)) {
+        if (context.isIgnoringBatteryOptimizations()) {
             description = stringProvider.getString(R.string.settings_troubleshoot_test_battery_success)
             status = TestStatus.SUCCESS
             quickFix = null
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt b/vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt
index 4be36d7de3..09bd56654d 100644
--- a/vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt
+++ b/vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt
@@ -27,6 +27,7 @@ import androidx.core.content.getSystemService
 import im.vector.app.core.extensions.singletonEntryPoint
 import im.vector.app.core.platform.PendingIntentCompat
 import im.vector.app.core.services.VectorSyncService
+import im.vector.app.core.time.Clock
 import org.matrix.android.sdk.api.session.sync.job.SyncService
 import timber.log.Timber
 
@@ -34,10 +35,13 @@ class AlarmSyncBroadcastReceiver : BroadcastReceiver() {
 
     override fun onReceive(context: Context, intent: Intent) {
         Timber.d("## Sync: AlarmSyncBroadcastReceiver received intent")
-        val vectorPreferences = context.singletonEntryPoint()
-                .takeIf { it.activeSessionHolder().getSafeActiveSession() != null }
-                ?.vectorPreferences()
-                ?: return Unit.also { Timber.v("No active session, so don't launch sync service.") }
+        val singletonEntryPoint = context.singletonEntryPoint()
+        if (singletonEntryPoint.activeSessionHolder().getSafeActiveSession() == null) {
+            Timber.v("No active session, so don't launch sync service.")
+            return
+        }
+        val vectorPreferences = singletonEntryPoint.vectorPreferences()
+        val clock = singletonEntryPoint.clock()
 
         val sessionId = intent.getStringExtra(SyncService.EXTRA_SESSION_ID) ?: return
         VectorSyncService.newPeriodicIntent(
@@ -52,7 +56,7 @@ class AlarmSyncBroadcastReceiver : BroadcastReceiver() {
                         ContextCompat.startForegroundService(context, it)
                     } catch (ex: Throwable) {
                         Timber.i("## Sync: Failed to start service, Alarm scheduled to restart service")
-                        scheduleAlarm(context, sessionId, vectorPreferences.backgroundSyncDelay())
+                        scheduleAlarm(context, sessionId, vectorPreferences.backgroundSyncDelay(), clock)
                         Timber.e(ex)
                     }
                 }
@@ -61,7 +65,7 @@ class AlarmSyncBroadcastReceiver : BroadcastReceiver() {
     companion object {
         private const val REQUEST_CODE = 0
 
-        fun scheduleAlarm(context: Context, sessionId: String, delayInSeconds: Int) {
+        fun scheduleAlarm(context: Context, sessionId: String, delayInSeconds: Int, clock: Clock) {
             // Reschedule
             Timber.v("## Sync: Scheduling alarm for background sync in $delayInSeconds seconds")
             val intent = Intent(context, AlarmSyncBroadcastReceiver::class.java).apply {
@@ -74,7 +78,7 @@ class AlarmSyncBroadcastReceiver : BroadcastReceiver() {
                     intent,
                     PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
             )
-            val firstMillis = System.currentTimeMillis() + delayInSeconds * 1000L
+            val firstMillis = clock.epochMillis() + delayInSeconds * 1000L
             val alarmMgr = context.getSystemService<AlarmManager>()!!
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 alarmMgr.setAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, firstMillis, pIntent)
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt b/vector/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt
index 935d7e6e13..aacd7723f5 100644
--- a/vector/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt
+++ b/vector/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt
@@ -29,10 +29,11 @@ class OnApplicationUpgradeOrRebootReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
         Timber.v("## onReceive() ${intent.action}")
         val singletonEntryPoint = context.singletonEntryPoint()
-            BackgroundSyncStarter.start(
-                    context,
-                    singletonEntryPoint.vectorPreferences(),
-                    singletonEntryPoint.activeSessionHolder()
-            )
+        BackgroundSyncStarter.start(
+                context,
+                singletonEntryPoint.vectorPreferences(),
+                singletonEntryPoint.activeSessionHolder(),
+                singletonEntryPoint.clock()
+        )
     }
 }
diff --git a/vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt b/vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
index 7603e738d7..425fd1081a 100755
--- a/vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
+++ b/vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
@@ -21,6 +21,7 @@ import android.app.Activity
 import android.content.Context
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.pushers.PushersManager
+import im.vector.app.core.time.Clock
 import im.vector.app.fdroid.BackgroundSyncStarter
 import im.vector.app.fdroid.receiver.AlarmSyncBroadcastReceiver
 import im.vector.app.features.settings.VectorPreferences
@@ -66,7 +67,10 @@ object FcmHelper {
         AlarmSyncBroadcastReceiver.cancelAlarm(context)
     }
 
-    fun onEnterBackground(context: Context, vectorPreferences: VectorPreferences, activeSessionHolder: ActiveSessionHolder) {
-        BackgroundSyncStarter.start(context, vectorPreferences, activeSessionHolder)
+    fun onEnterBackground(context: Context,
+                          vectorPreferences: VectorPreferences,
+                          activeSessionHolder: ActiveSessionHolder,
+                          clock: Clock) {
+        BackgroundSyncStarter.start(context, vectorPreferences, activeSessionHolder, clock)
     }
 }
diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt
index cc682e7a5f..ecb457bf9f 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt
@@ -31,7 +31,7 @@ import javax.inject.Inject
  */
 class TestPlayServices @Inject constructor(private val context: FragmentActivity,
                                            private val stringProvider: StringProvider) :
-    TroubleshootTest(R.string.settings_troubleshoot_test_play_services_title) {
+        TroubleshootTest(R.string.settings_troubleshoot_test_play_services_title) {
 
     override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         val apiAvailability = GoogleApiAvailability.getInstance()
diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
index 7ae68b201b..f485de760a 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
@@ -41,7 +41,7 @@ class TestPushFromPushGateway @Inject constructor(private val context: FragmentA
                                                   private val errorFormatter: ErrorFormatter,
                                                   private val pushersManager: PushersManager,
                                                   private val activeSessionHolder: ActiveSessionHolder) :
-    TroubleshootTest(R.string.settings_troubleshoot_test_push_loop_title) {
+        TroubleshootTest(R.string.settings_troubleshoot_test_push_loop_title) {
 
     private var action: Job? = null
     private var pushReceived: Boolean = false
diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
index 913b5491ea..2db03f3428 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
@@ -37,7 +37,7 @@ class TestTokenRegistration @Inject constructor(private val context: FragmentAct
                                                 private val stringProvider: StringProvider,
                                                 private val pushersManager: PushersManager,
                                                 private val activeSessionHolder: ActiveSessionHolder) :
-    TroubleshootTest(R.string.settings_troubleshoot_test_token_registration_title) {
+        TroubleshootTest(R.string.settings_troubleshoot_test_token_registration_title) {
 
     override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         // Check if we have a registered pusher for this token
@@ -49,12 +49,14 @@ class TestTokenRegistration @Inject constructor(private val context: FragmentAct
             status = TestStatus.FAILED
             return
         }
-        val pushers = session.getPushers().filter {
+        val pushers = session.pushersService().getPushers().filter {
             it.pushKey == fcmToken && it.state == PusherState.REGISTERED
         }
         if (pushers.isEmpty()) {
-            description = stringProvider.getString(R.string.settings_troubleshoot_test_token_registration_failed,
-                    stringProvider.getString(R.string.sas_error_unknown))
+            description = stringProvider.getString(
+                    R.string.settings_troubleshoot_test_token_registration_failed,
+                    stringProvider.getString(R.string.sas_error_unknown)
+            )
             quickFix = object : TroubleshootQuickFix(R.string.settings_troubleshoot_test_token_registration_quick_fix) {
                 override fun doFix() {
                     val workId = pushersManager.enqueueRegisterPusherWithFcmKey(fcmToken)
diff --git a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
index 93a82f24f9..b62520278a 100755
--- a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
@@ -46,6 +46,8 @@ import kotlinx.coroutines.runBlocking
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.logger.LoggerTag
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -194,7 +196,7 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
 
         coroutineScope.launch {
             Timber.tag(loggerTag.value).d("Fast lane: start request")
-            val event = tryOrNull { session.getEvent(roomId, eventId) } ?: return@launch
+            val event = tryOrNull { session.eventService().getEvent(roomId, eventId) } ?: return@launch
 
             val resolvedEvent = notifiableEventResolver.resolveInMemoryEvent(session, event, canBeReplaced = true)
 
diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt b/vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
index 52ad4be087..3d44f10f76 100755
--- a/vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
+++ b/vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
@@ -26,6 +26,7 @@ import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.DefaultSharedPreferences
 import im.vector.app.core.pushers.PushersManager
+import im.vector.app.core.time.Clock
 import im.vector.app.features.settings.VectorPreferences
 import timber.log.Timber
 
@@ -107,7 +108,10 @@ object FcmHelper {
     }
 
     @Suppress("UNUSED_PARAMETER")
-    fun onEnterBackground(context: Context, vectorPreferences: VectorPreferences, activeSessionHolder: ActiveSessionHolder) {
+    fun onEnterBackground(context: Context,
+                          vectorPreferences: VectorPreferences,
+                          activeSessionHolder: ActiveSessionHolder,
+                          clock: Clock) {
         // No op
     }
 }
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index eada664216..20b7c4908a 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -375,6 +375,12 @@
             android:exported="false"
             android:foregroundServiceType="location" />
 
+        <service
+            android:name=".features.call.webrtc.ScreenCaptureService"
+            android:exported="false"
+            android:foregroundServiceType="mediaProjection"
+            tools:targetApi="Q" />
+
         <!-- Receivers -->
 
         <receiver
diff --git a/vector/src/main/java/im/vector/app/AppStateHandler.kt b/vector/src/main/java/im/vector/app/AppStateHandler.kt
index cc3aed03fb..1608d561bc 100644
--- a/vector/src/main/java/im/vector/app/AppStateHandler.kt
+++ b/vector/src/main/java/im/vector/app/AppStateHandler.kt
@@ -38,6 +38,8 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import org.matrix.android.sdk.api.session.initsync.SyncStatusService
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
@@ -78,7 +80,7 @@ class AppStateHandler @Inject constructor(
         return selectedSpaceDataSource.currentValue?.orNull()?.let {
             if (it is RoomGroupingMethod.BySpace) {
                 // try to refresh sum?
-                it.spaceSummary?.roomId?.let { activeSessionHolder.getSafeActiveSession()?.getRoomSummary(it) }?.let {
+                it.spaceSummary?.roomId?.let { activeSessionHolder.getSafeActiveSession()?.roomService()?.getRoomSummary(it) }?.let {
                     RoomGroupingMethod.BySpace(it)
                 } ?: it
             } else it
@@ -100,7 +102,7 @@ class AppStateHandler @Inject constructor(
         if (spaceId != null) {
             uSession.coroutineScope.launch(Dispatchers.IO) {
                 tryOrNull {
-                    uSession.getRoom(spaceId)?.loadRoomMembersIfNeeded()
+                    uSession.getRoom(spaceId)?.membershipService()?.loadRoomMembersIfNeeded()
                 }
             }
         }
@@ -110,12 +112,12 @@ class AppStateHandler @Inject constructor(
         val uSession = session ?: activeSessionHolder.getSafeActiveSession() ?: return
         if (selectedSpaceDataSource.currentValue?.orNull() is RoomGroupingMethod.ByLegacyGroup &&
                 groupId == selectedSpaceDataSource.currentValue?.orNull()?.group()?.groupId) return
-        val activeGroup = groupId?.let { uSession.getGroupSummary(groupId) }
+        val activeGroup = groupId?.let { uSession.groupService().getGroupSummary(groupId) }
         selectedSpaceDataSource.post(Option.just(RoomGroupingMethod.ByLegacyGroup(activeGroup)))
         if (groupId != null) {
             uSession.coroutineScope.launch {
                 tryOrNull {
-                    uSession.getGroup(groupId)?.fetchGroupData()
+                    uSession.groupService().getGroup(groupId)?.fetchGroupData()
                 }
             }
         }
@@ -139,7 +141,7 @@ class AppStateHandler @Inject constructor(
     }
 
     private fun observeSyncStatus(session: Session) {
-        session.getSyncStatusLive()
+        session.syncStatusService().getSyncStatusLive()
                 .asFlow()
                 .filterIsInstance<SyncStatusService.Status.IncrementalSyncDone>()
                 .map { session.spaceService().getRootSpaceSummaries().size }
diff --git a/vector/src/main/java/im/vector/app/AutoRageShaker.kt b/vector/src/main/java/im/vector/app/AutoRageShaker.kt
index 195e2f68dc..c77ce2b647 100644
--- a/vector/src/main/java/im/vector/app/AutoRageShaker.kt
+++ b/vector/src/main/java/im/vector/app/AutoRageShaker.kt
@@ -169,7 +169,7 @@ class AutoRageShaker @Inject constructor(
 
                         coroutineScope.launch {
                             try {
-                                activeSessionHolder.getSafeActiveSession()?.sendToDevice(
+                                activeSessionHolder.getSafeActiveSession()?.toDeviceService()?.sendToDevice(
                                         eventType = AUTO_RS_REQUEST,
                                         userId = target.senderUserId,
                                         deviceId = target.senderDeviceId,
@@ -261,7 +261,7 @@ class AutoRageShaker @Inject constructor(
         this.currentActiveSessionId = sessionId
 
         hasSynced = session.hasAlreadySynced()
-        session.getSyncStatusLive()
+        session.syncStatusService().getSyncStatusLive()
                 .asFlow()
                 .onEach {
                     hasSynced = it !is SyncStatusService.Status.InitialSyncProgressing
@@ -269,11 +269,11 @@ class AutoRageShaker @Inject constructor(
                 .launchIn(session.coroutineScope)
         activeSessionIds.add(sessionId)
         session.addListener(this)
-        session.addEventStreamListener(detector)
+        session.eventStreamService().addEventStreamListener(detector)
     }
 
     override fun onSessionStopped(session: Session) {
-        session.removeEventStreamListener(detector)
+        session.eventStreamService().removeEventStreamListener(detector)
         activeSessionIds.remove(session.sessionId)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/UISIDetector.kt b/vector/src/main/java/im/vector/app/UISIDetector.kt
index 6157537743..4a9d8ae266 100644
--- a/vector/src/main/java/im/vector/app/UISIDetector.kt
+++ b/vector/src/main/java/im/vector/app/UISIDetector.kt
@@ -34,7 +34,7 @@ data class E2EMessageDetected(
         val senderDeviceId: String,
         val senderKey: String,
         val sessionId: String
-        ) {
+) {
 
     companion object {
         fun fromEvent(event: Event, roomId: String): E2EMessageDetected {
@@ -52,7 +52,7 @@ data class E2EMessageDetected(
     }
 }
 
-class UISIDetector : LiveEventListener {
+class UISIDetector(private val timeoutMillis: Long = 30_000L) : LiveEventListener {
 
     interface UISIDetectorCallback {
         val enabled: Boolean
@@ -66,7 +66,6 @@ class UISIDetector : LiveEventListener {
     private val trackedEvents = mutableMapOf<String, TimerTask>()
     private val executor = Executors.newSingleThreadExecutor()
     private val timer = Timer()
-    private val timeoutMillis = 30_000L
     private val enabled: Boolean get() = callback?.enabled.orFalse()
 
     override fun onEventDecrypted(event: Event, clearEvent: JsonDict) {
@@ -90,30 +89,35 @@ class UISIDetector : LiveEventListener {
         val roomId = event.roomId
         if (!enabled || eventId == null || roomId == null) return
 
-        val trackerId: String = trackerId(eventId, roomId)
-        if (trackedEvents.containsKey(trackerId)) {
-            Timber.w("## UISIDetector: Event $eventId is already tracked")
+        val trackedId: String = trackedId(eventId, roomId)
+        if (trackedEvents.containsKey(trackedId)) {
+            Timber.v("## UISIDetector: Event $eventId is already tracked")
             return
         }
         // track it and start timer
         val timeoutTask = object : TimerTask() {
             override fun run() {
                 executor.execute {
+                    // we should check if it's still tracked (it might have been decrypted)
+                    if (!trackedEvents.containsKey(trackedId)) {
+                        Timber.v("## UISIDetector: E2E error for $eventId was resolved")
+                        return@execute
+                    }
                     unTrack(eventId, roomId)
                     Timber.v("## UISIDetector: Timeout on $eventId")
                     triggerUISI(E2EMessageDetected.fromEvent(event, roomId))
                 }
             }
         }
-        trackedEvents[trackerId] = timeoutTask
+        trackedEvents[trackedId] = timeoutTask
         timer.schedule(timeoutTask, timeoutMillis)
     }
 
-    override fun onLiveEvent(roomId: String, event: Event) { }
+    override fun onLiveEvent(roomId: String, event: Event) {}
 
-    override fun onPaginatedEvent(roomId: String, event: Event) { }
+    override fun onPaginatedEvent(roomId: String, event: Event) {}
 
-    private fun trackerId(eventId: String, roomId: String): String = "$roomId-$eventId"
+    private fun trackedId(eventId: String, roomId: String): String = "$roomId-$eventId"
 
     private fun triggerUISI(source: E2EMessageDetected) {
         if (!enabled) return
@@ -122,6 +126,6 @@ class UISIDetector : LiveEventListener {
     }
 
     private fun unTrack(eventId: String, roomId: String) {
-        trackedEvents.remove(trackerId(eventId, roomId))?.cancel()
+        trackedEvents.remove(trackedId(eventId, roomId))?.cancel()
     }
 }
diff --git a/vector/src/main/java/im/vector/app/VectorApplication.kt b/vector/src/main/java/im/vector/app/VectorApplication.kt
index e12eecfefc..0bf4eb13b6 100644
--- a/vector/src/main/java/im/vector/app/VectorApplication.kt
+++ b/vector/src/main/java/im/vector/app/VectorApplication.kt
@@ -43,6 +43,7 @@ import dagger.hilt.android.HiltAndroidApp
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.configureAndStart
 import im.vector.app.core.extensions.startSyncing
+import im.vector.app.core.time.Clock
 import im.vector.app.features.analytics.VectorAnalytics
 import im.vector.app.features.call.webrtc.WebRtcCallManager
 import im.vector.app.features.configuration.VectorConfiguration
@@ -85,6 +86,7 @@ class VectorApplication :
     @Inject lateinit var emojiCompatWrapper: EmojiCompatWrapper
     @Inject lateinit var vectorUncaughtExceptionHandler: VectorUncaughtExceptionHandler
     @Inject lateinit var activeSessionHolder: ActiveSessionHolder
+    @Inject lateinit var clock: Clock
     @Inject lateinit var notificationDrawerManager: NotificationDrawerManager
     @Inject lateinit var vectorPreferences: VectorPreferences
     @Inject lateinit var versionProvider: VersionProvider
@@ -180,7 +182,7 @@ class VectorApplication :
 
             override fun onPause(owner: LifecycleOwner) {
                 Timber.i("App entered background")
-                FcmHelper.onEnterBackground(appContext, vectorPreferences, activeSessionHolder)
+                FcmHelper.onEnterBackground(appContext, vectorPreferences, activeSessionHolder, clock)
             }
         })
         ProcessLifecycleOwner.get().lifecycle.addObserver(appStateHandler)
@@ -211,10 +213,12 @@ class VectorApplication :
 
     private fun enableStrictModeIfNeeded() {
         if (BuildConfig.ENABLE_STRICT_MODE_LOGS) {
-            StrictMode.setThreadPolicy(StrictMode.ThreadPolicy.Builder()
-                    .detectAll()
-                    .penaltyLog()
-                    .build())
+            StrictMode.setThreadPolicy(
+                    StrictMode.ThreadPolicy.Builder()
+                            .detectAll()
+                            .penaltyLog()
+                            .build()
+            )
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/core/contacts/ContactsDataSource.kt b/vector/src/main/java/im/vector/app/core/contacts/ContactsDataSource.kt
index db0fab9c42..577533f758 100644
--- a/vector/src/main/java/im/vector/app/core/contacts/ContactsDataSource.kt
+++ b/vector/src/main/java/im/vector/app/core/contacts/ContactsDataSource.kt
@@ -83,14 +83,16 @@ class ContactsDataSource @Inject constructor(
 
             // Get the phone numbers
             if (withMsisdn) {
-                contentResolver.query(ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
+                contentResolver.query(
+                        ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
                         arrayOf(
                                 ContactsContract.CommonDataKinds.Phone.CONTACT_ID,
                                 ContactsContract.CommonDataKinds.Phone.NUMBER
                         ),
                         null,
                         null,
-                        null)
+                        null
+                )
                         ?.use { cursor ->
                             val idColumnIndex = cursor.getColumnIndexOrNull(ContactsContract.CommonDataKinds.Phone.CONTACT_ID) ?: return@use
                             val phoneNumberColumnIndex = cursor.getColumnIndexOrNull(ContactsContract.CommonDataKinds.Phone.NUMBER) ?: return@use
@@ -122,7 +124,8 @@ class ContactsDataSource @Inject constructor(
                         ),
                         null,
                         null,
-                        null)
+                        null
+                )
                         ?.use { cursor ->
                             val idColumnIndex = cursor.getColumnIndexOrNull(ContactsContract.CommonDataKinds.Email.CONTACT_ID) ?: return@use
                             val emailColumnIndex = cursor.getColumnIndexOrNull(ContactsContract.CommonDataKinds.Email.DATA) ?: return@use
diff --git a/vector/src/main/java/im/vector/app/core/date/DefaultDateFormatterProvider.kt b/vector/src/main/java/im/vector/app/core/date/DefaultDateFormatterProvider.kt
index 6371035a17..361868cd95 100644
--- a/vector/src/main/java/im/vector/app/core/date/DefaultDateFormatterProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/date/DefaultDateFormatterProvider.kt
@@ -24,7 +24,7 @@ import javax.inject.Inject
 
 class DefaultDateFormatterProvider @Inject constructor(private val context: Context,
                                                        private val localeProvider: LocaleProvider) :
-    DateFormatterProvider {
+        DateFormatterProvider {
 
     override val dateWithMonthFormatter: DateTimeFormatter by lazy {
         val pattern = DateFormat.getBestDateTimePattern(localeProvider.current(), "d MMMMM")
diff --git a/vector/src/main/java/im/vector/app/core/date/VectorDateFormatter.kt b/vector/src/main/java/im/vector/app/core/date/VectorDateFormatter.kt
index eb6f6a94f7..029fce7423 100644
--- a/vector/src/main/java/im/vector/app/core/date/VectorDateFormatter.kt
+++ b/vector/src/main/java/im/vector/app/core/date/VectorDateFormatter.kt
@@ -22,15 +22,19 @@ import android.text.format.DateUtils
 import im.vector.app.core.resources.DateProvider
 import im.vector.app.core.resources.LocaleProvider
 import im.vector.app.core.resources.toTimestamp
+import im.vector.app.core.time.Clock
 import org.threeten.bp.LocalDateTime
 import org.threeten.bp.Period
 import org.threeten.bp.format.DateTimeFormatter
 import javax.inject.Inject
 import kotlin.math.absoluteValue
 
-class VectorDateFormatter @Inject constructor(private val context: Context,
-                                              private val localeProvider: LocaleProvider,
-                                              private val dateFormatterProviders: DateFormatterProviders) {
+class VectorDateFormatter @Inject constructor(
+        private val context: Context,
+        private val localeProvider: LocaleProvider,
+        private val dateFormatterProviders: DateFormatterProviders,
+        private val clock: Clock,
+) {
 
     private val hourFormatter by lazy {
         if (DateFormat.is24HourFormat(context)) {
@@ -158,8 +162,9 @@ class VectorDateFormatter @Inject constructor(private val context: Context,
     private fun getRelativeDay(ts: Long): String {
         return DateUtils.getRelativeTimeSpanString(
                 ts,
-                System.currentTimeMillis(),
+                clock.epochMillis(),
                 DateUtils.DAY_IN_MILLIS,
-                DateUtils.FORMAT_SHOW_WEEKDAY).toString()
+                DateUtils.FORMAT_SHOW_WEEKDAY
+        ).toString()
     }
 }
diff --git a/vector/src/main/java/im/vector/app/core/di/HiltMavericksViewModelFactory.kt b/vector/src/main/java/im/vector/app/core/di/HiltMavericksViewModelFactory.kt
index 13702053e8..5850cb8cb9 100644
--- a/vector/src/main/java/im/vector/app/core/di/HiltMavericksViewModelFactory.kt
+++ b/vector/src/main/java/im/vector/app/core/di/HiltMavericksViewModelFactory.kt
@@ -45,7 +45,7 @@ import dagger.hilt.components.SingletonComponent
 inline fun <reified VM : MavericksViewModel<S>, S : MavericksState> hiltMavericksViewModelFactory() = HiltMavericksViewModelFactory<VM, S>(VM::class.java)
 
 class HiltMavericksViewModelFactory<VM : MavericksViewModel<S>, S : MavericksState>(
-    private val viewModelClass: Class<out MavericksViewModel<S>>
+        private val viewModelClass: Class<out MavericksViewModel<S>>
 ) : MavericksViewModelFactory<VM, S> {
 
     override fun create(viewModelContext: ViewModelContext, state: S): VM {
diff --git a/vector/src/main/java/im/vector/app/core/di/SingletonEntryPoint.kt b/vector/src/main/java/im/vector/app/core/di/SingletonEntryPoint.kt
index 283437c679..dc88229a10 100644
--- a/vector/src/main/java/im/vector/app/core/di/SingletonEntryPoint.kt
+++ b/vector/src/main/java/im/vector/app/core/di/SingletonEntryPoint.kt
@@ -21,6 +21,7 @@ import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import im.vector.app.core.dialogs.UnrecognizedCertificateDialog
 import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.time.Clock
 import im.vector.app.features.analytics.AnalyticsTracker
 import im.vector.app.features.call.webrtc.WebRtcCallManager
 import im.vector.app.features.home.AvatarRenderer
@@ -46,6 +47,8 @@ interface SingletonEntryPoint {
 
     fun navigator(): Navigator
 
+    fun clock(): Clock
+
     fun errorFormatter(): ErrorFormatter
 
     fun bugReporter(): BugReporter
diff --git a/vector/src/main/java/im/vector/app/core/dialogs/ExportKeysDialog.kt b/vector/src/main/java/im/vector/app/core/dialogs/ExportKeysDialog.kt
index b87b7f0286..024d283c4c 100644
--- a/vector/src/main/java/im/vector/app/core/dialogs/ExportKeysDialog.kt
+++ b/vector/src/main/java/im/vector/app/core/dialogs/ExportKeysDialog.kt
@@ -35,7 +35,7 @@ class ExportKeysDialog {
         val textWatcher = object : SimpleTextWatcher() {
             override fun afterTextChanged(s: Editable) {
                 when {
-                    views.exportDialogEt.text.isNullOrEmpty()                                   -> {
+                    views.exportDialogEt.text.isNullOrEmpty()                                           -> {
                         views.exportDialogSubmit.isEnabled = false
                         views.exportDialogTilConfirm.error = null
                     }
@@ -43,7 +43,7 @@ class ExportKeysDialog {
                         views.exportDialogSubmit.isEnabled = true
                         views.exportDialogTilConfirm.error = null
                     }
-                    else                                                                       -> {
+                    else                                                                                -> {
                         views.exportDialogSubmit.isEnabled = false
                         views.exportDialogTilConfirm.error = activity.getString(R.string.passphrase_passphrase_does_not_match)
                     }
diff --git a/vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelper.kt b/vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelper.kt
index 8f70808087..a9e223709a 100644
--- a/vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelper.kt
+++ b/vector/src/main/java/im/vector/app/core/dialogs/GalleryOrCameraDialogHelper.kt
@@ -27,6 +27,7 @@ import im.vector.app.core.dialogs.GalleryOrCameraDialogHelper.Listener
 import im.vector.app.core.extensions.insertBeforeLast
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.time.Clock
 import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
 import im.vector.app.core.utils.checkPermissions
 import im.vector.app.core.utils.onPermissionDeniedDialog
@@ -45,7 +46,8 @@ import java.io.File
 class GalleryOrCameraDialogHelper(
         // must implement GalleryOrCameraDialogHelper.Listener
         private val fragment: Fragment,
-        private val colorProvider: ColorProvider
+        private val colorProvider: ColorProvider,
+        private val clock: Clock,
 ) {
     interface Listener {
         fun onImageReady(uri: Uri?)
@@ -91,7 +93,7 @@ class GalleryOrCameraDialogHelper(
     }
 
     private fun startUCrop(image: MultiPickerImageType) {
-        val destinationFile = File(activity.cacheDir, image.displayName.insertBeforeLast("_e_${System.currentTimeMillis()}"))
+        val destinationFile = File(activity.cacheDir, image.displayName.insertBeforeLast("_e_${clock.epochMillis()}"))
         val uri = image.contentUri
         createUCropWithDefaultSettings(colorProvider, uri, destinationFile.toUri(), fragment.getString(R.string.rotate_and_crop_screen_title))
                 .withAspectRatio(1f, 1f)
@@ -107,10 +109,12 @@ class GalleryOrCameraDialogHelper(
     fun show() {
         MaterialAlertDialogBuilder(activity)
                 .setTitle(R.string.attachment_type_dialog_title)
-                .setItems(arrayOf(
-                        fragment.getString(R.string.attachment_type_camera),
-                        fragment.getString(R.string.attachment_type_gallery)
-                )) { _, which ->
+                .setItems(
+                        arrayOf(
+                                fragment.getString(R.string.attachment_type_camera),
+                                fragment.getString(R.string.attachment_type_gallery)
+                        )
+                ) { _, which ->
                     onAvatarTypeSelected(if (which == 0) Type.Camera else Type.Gallery)
                 }
                 .setPositiveButton(R.string.action_cancel, null)
diff --git a/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt b/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt
index 415c82b330..b594dbcac4 100644
--- a/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt
+++ b/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt
@@ -113,13 +113,17 @@ class UnrecognizedCertificateDialog @Inject constructor(
         views.sslFingerprintTitle.text = stringProvider.getString(R.string.ssl_fingerprint_hash, unrecognizedFingerprint.hashType.toString())
         views.sslFingerprint.text = unrecognizedFingerprint.displayableHexRepr
         if (userId != null) {
-            views.sslUserId.text = stringProvider.getString(R.string.generic_label_and_value,
+            views.sslUserId.text = stringProvider.getString(
+                    R.string.generic_label_and_value,
                     stringProvider.getString(R.string.username),
-                    userId)
+                    userId
+            )
         } else {
-            views.sslUserId.text = stringProvider.getString(R.string.generic_label_and_value,
+            views.sslUserId.text = stringProvider.getString(
+                    R.string.generic_label_and_value,
                     stringProvider.getString(R.string.hs_url),
-                    homeServerUrl)
+                    homeServerUrl
+            )
         }
         if (existing) {
             if (homeServerConnectionConfigHasFingerprints) {
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItem.kt
index 0af342641e..90e81ceb26 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItem.kt
@@ -32,6 +32,7 @@ abstract class ProfileMatrixItem : BaseProfileMatrixItem<ProfileMatrixItem.Holde
     open class Holder : VectorEpoxyHolder() {
         val titleView by bind<TextView>(R.id.matrixItemTitle)
         val subtitleView by bind<TextView>(R.id.matrixItemSubtitle)
+        val ignoredUserView by bind<ImageView>(R.id.matrixItemIgnored)
         val powerLabel by bind<TextView>(R.id.matrixItemPowerLevelLabel)
         val presenceImageView by bind<PresenceStateImageView>(R.id.matrixItemPresenceImageView)
         val avatarImageView by bind<ImageView>(R.id.matrixItemAvatar)
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItemWithPowerLevel.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItemWithPowerLevel.kt
index 12189dc8f4..453f402496 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItemWithPowerLevel.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItemWithPowerLevel.kt
@@ -26,11 +26,13 @@ import im.vector.app.core.extensions.setTextOrHide
 @EpoxyModelClass(layout = R.layout.item_profile_matrix_item)
 abstract class ProfileMatrixItemWithPowerLevel : ProfileMatrixItem() {
 
+    @EpoxyAttribute var ignoredUser: Boolean = false
     @EpoxyAttribute var powerLevelLabel: CharSequence? = null
 
     override fun bind(holder: Holder) {
         super.bind(holder)
         holder.editableView.isVisible = false
+        holder.ignoredUserView.isVisible = ignoredUser
         holder.powerLabel.setTextOrHide(powerLevelLabel)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
index 2eb36d758e..a6f80a256e 100644
--- a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
+++ b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
@@ -155,15 +155,17 @@ class DefaultErrorFormatter @Inject constructor(
     }
 
     private fun identityServerError(identityServiceError: IdentityServiceError): String {
-        return stringProvider.getString(when (identityServiceError) {
-            IdentityServiceError.OutdatedIdentityServer       -> R.string.identity_server_error_outdated_identity_server
-            IdentityServiceError.OutdatedHomeServer           -> R.string.identity_server_error_outdated_home_server
-            IdentityServiceError.NoIdentityServerConfigured   -> R.string.identity_server_error_no_identity_server_configured
-            IdentityServiceError.TermsNotSignedException      -> R.string.identity_server_error_terms_not_signed
-            IdentityServiceError.BulkLookupSha256NotSupported -> R.string.identity_server_error_bulk_sha256_not_supported
-            IdentityServiceError.BindingError                 -> R.string.identity_server_error_binding_error
-            IdentityServiceError.NoCurrentBindingError        -> R.string.identity_server_error_no_current_binding_error
-            IdentityServiceError.UserConsentNotProvided       -> R.string.identity_server_user_consent_not_provided
-        })
+        return stringProvider.getString(
+                when (identityServiceError) {
+                    IdentityServiceError.OutdatedIdentityServer       -> R.string.identity_server_error_outdated_identity_server
+                    IdentityServiceError.OutdatedHomeServer           -> R.string.identity_server_error_outdated_home_server
+                    IdentityServiceError.NoIdentityServerConfigured   -> R.string.identity_server_error_no_identity_server_configured
+                    IdentityServiceError.TermsNotSignedException      -> R.string.identity_server_error_terms_not_signed
+                    IdentityServiceError.BulkLookupSha256NotSupported -> R.string.identity_server_error_bulk_sha256_not_supported
+                    IdentityServiceError.BindingError                 -> R.string.identity_server_error_binding_error
+                    IdentityServiceError.NoCurrentBindingError        -> R.string.identity_server_error_no_current_binding_error
+                    IdentityServiceError.UserConsentNotProvided       -> R.string.identity_server_user_consent_not_provided
+                }
+        )
     }
 }
diff --git a/vector/src/main/java/im/vector/app/core/extensions/Session.kt b/vector/src/main/java/im/vector/app/core/extensions/Session.kt
index 87ed51522f..9bc1aff868 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/Session.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Session.kt
@@ -30,11 +30,11 @@ import timber.log.Timber
 fun Session.configureAndStart(context: Context, startSyncing: Boolean = true) {
     Timber.i("Configure and start session for $myUserId")
     open()
-    setFilter(FilterService.FilterPreset.ElementFilter)
+    filterService().setFilter(FilterService.FilterPreset.ElementFilter)
     if (startSyncing) {
         startSyncing(context)
     }
-    refreshPushers()
+    pushersService().refreshPushers()
     context.singletonEntryPoint().webRtcCallManager().checkForProtocolsSupportIfNeeded()
 }
 
@@ -74,8 +74,8 @@ fun Session.cannotLogoutSafely(): Boolean {
     return hasUnsavedKeys() ||
             // has local cross signing keys
             (cryptoService().crossSigningService().allPrivateKeysKnown() &&
-            // That are not backed up
-            !sharedSecretStorageService.isRecoverySetup())
+                    // That are not backed up
+                    !sharedSecretStorageService().isRecoverySetup())
 }
 
 fun Session.vectorStore(context: Context) = VectorSessionStore(context, myUserId)
diff --git a/vector/src/main/java/im/vector/app/core/glide/AvatarPlaceholder.kt b/vector/src/main/java/im/vector/app/core/glide/AvatarPlaceholder.kt
index e61f81de55..e7ced6b335 100644
--- a/vector/src/main/java/im/vector/app/core/glide/AvatarPlaceholder.kt
+++ b/vector/src/main/java/im/vector/app/core/glide/AvatarPlaceholder.kt
@@ -43,7 +43,7 @@ class AvatarPlaceholderModelLoaderFactory(private val context: Context) : ModelL
 }
 
 class AvatarPlaceholderModelLoader(private val context: Context) :
-    ModelLoader<AvatarPlaceholder, Drawable> {
+        ModelLoader<AvatarPlaceholder, Drawable> {
 
     override fun buildLoadData(model: AvatarPlaceholder, width: Int, height: Int, options: Options): ModelLoader.LoadData<Drawable>? {
         return ModelLoader.LoadData(ObjectKey(model), AvatarPlaceholderDataFetcher(context, model))
@@ -55,7 +55,7 @@ class AvatarPlaceholderModelLoader(private val context: Context) :
 }
 
 class AvatarPlaceholderDataFetcher(context: Context, private val data: AvatarPlaceholder) :
-    DataFetcher<Drawable> {
+        DataFetcher<Drawable> {
 
     private val avatarRenderer = context.singletonEntryPoint().avatarRenderer()
 
diff --git a/vector/src/main/java/im/vector/app/core/glide/ElementToDecryptOption.kt b/vector/src/main/java/im/vector/app/core/glide/ElementToDecryptOption.kt
index f4f854406e..04b351515a 100644
--- a/vector/src/main/java/im/vector/app/core/glide/ElementToDecryptOption.kt
+++ b/vector/src/main/java/im/vector/app/core/glide/ElementToDecryptOption.kt
@@ -22,4 +22,5 @@ import org.matrix.android.sdk.api.session.crypto.attachments.ElementToDecrypt
 const val ElementToDecryptOptionKey = "im.vector.app.core.glide.ElementToDecrypt"
 
 val ELEMENT_TO_DECRYPT = Option.memory(
-        ElementToDecryptOptionKey, ElementToDecrypt("", "", ""))
+        ElementToDecryptOptionKey, ElementToDecrypt("", "", "")
+)
diff --git a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
index 6b42e3fff8..a643ee908c 100644
--- a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
+++ b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
@@ -49,7 +49,7 @@ class VectorGlideModelLoaderFactory(private val context: Context) : ModelLoaderF
 }
 
 class VectorGlideModelLoader(private val context: Context) :
-    ModelLoader<ImageContentRenderer.Data, InputStream> {
+        ModelLoader<ImageContentRenderer.Data, InputStream> {
     override fun handles(model: ImageContentRenderer.Data): Boolean {
         // Always handle
         return true
@@ -64,7 +64,7 @@ class VectorGlideDataFetcher(context: Context,
                              private val data: ImageContentRenderer.Data,
                              private val width: Int,
                              private val height: Int) :
-    DataFetcher<InputStream> {
+        DataFetcher<InputStream> {
 
     private val localFilesHelper = LocalFilesHelper(context)
     private val activeSessionHolder = context.singletonEntryPoint().activeSessionHolder()
@@ -121,7 +121,8 @@ class VectorGlideDataFetcher(context: Context,
                         fileName = data.filename,
                         mimeType = data.mimeType,
                         url = data.url,
-                        elementToDecrypt = data.elementToDecrypt)
+                        elementToDecrypt = data.elementToDecrypt
+                )
             }
             withContext(Dispatchers.Main) {
                 result.fold(
diff --git a/vector/src/main/java/im/vector/app/core/linkify/VectorAutoLinkPatterns.kt b/vector/src/main/java/im/vector/app/core/linkify/VectorAutoLinkPatterns.kt
index bc45ab5676..b9fab37e43 100644
--- a/vector/src/main/java/im/vector/app/core/linkify/VectorAutoLinkPatterns.kt
+++ b/vector/src/main/java/im/vector/app/core/linkify/VectorAutoLinkPatterns.kt
@@ -24,14 +24,16 @@ object VectorAutoLinkPatterns {
     private const val LAT_OR_LONG_OR_ALT_NUMBER = "-?\\d+(?:\\.\\d+)?"
     private const val COORDINATE_SYSTEM = ";crs=[\\w-]+"
 
-    val GEO_URI: Regex = Regex("(?:geo:)?" +
-            "(" + LAT_OR_LONG_OR_ALT_NUMBER + ")" +
-            "," +
-            "(" + LAT_OR_LONG_OR_ALT_NUMBER + ")" +
-            "(?:" + "," + LAT_OR_LONG_OR_ALT_NUMBER + ")?" + // altitude
-            "(?:" + COORDINATE_SYSTEM + ")?" +
-            "(?:" + ";u=\\d+(?:\\.\\d+)?" + ")?" + // uncertainty in meters
-            "(?:" +
-            ";[\\w-]+=(?:[\\w-_.!~*'()]|%[\\da-f][\\da-f])+" + // dafuk
-            ")*", RegexOption.IGNORE_CASE)
+    val GEO_URI: Regex = Regex(
+            "(?:geo:)?" +
+                    "(" + LAT_OR_LONG_OR_ALT_NUMBER + ")" +
+                    "," +
+                    "(" + LAT_OR_LONG_OR_ALT_NUMBER + ")" +
+                    "(?:" + "," + LAT_OR_LONG_OR_ALT_NUMBER + ")?" + // altitude
+                    "(?:" + COORDINATE_SYSTEM + ")?" +
+                    "(?:" + ";u=\\d+(?:\\.\\d+)?" + ")?" + // uncertainty in meters
+                    "(?:" +
+                    ";[\\w-]+=(?:[\\w-_.!~*'()]|%[\\da-f][\\da-f])+" + // dafuk
+                    ")*", RegexOption.IGNORE_CASE
+    )
 }
diff --git a/vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt b/vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt
index e7e91dbfd9..128591fd96 100755
--- a/vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt
@@ -29,7 +29,7 @@ import im.vector.app.core.epoxy.onClick
 import im.vector.app.databinding.ViewButtonStateBinding
 
 class ButtonStateView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0) :
-    FrameLayout(context, attrs, defStyle) {
+        FrameLayout(context, attrs, defStyle) {
 
     sealed class State {
         object Button : State()
@@ -62,7 +62,8 @@ class ButtonStateView @JvmOverloads constructor(context: Context, attrs: Attribu
         context.theme.obtainStyledAttributes(
                 attrs,
                 R.styleable.ButtonStateView,
-                0, 0)
+                0, 0
+        )
                 .apply {
                     try {
                         if (getBoolean(R.styleable.ButtonStateView_bsv_use_flat_button, true)) {
diff --git a/vector/src/main/java/im/vector/app/core/platform/MaxHeightScrollView.kt b/vector/src/main/java/im/vector/app/core/platform/MaxHeightScrollView.kt
index 8d4c5d8950..da15d4413d 100644
--- a/vector/src/main/java/im/vector/app/core/platform/MaxHeightScrollView.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/MaxHeightScrollView.kt
@@ -25,7 +25,7 @@ import im.vector.app.R
 private const val DEFAULT_MAX_HEIGHT = 200
 
 class MaxHeightScrollView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0) :
-    NestedScrollView(context, attrs, defStyle) {
+        NestedScrollView(context, attrs, defStyle) {
 
     var maxHeight: Int = 0
         set(value) {
diff --git a/vector/src/main/java/im/vector/app/core/platform/StateView.kt b/vector/src/main/java/im/vector/app/core/platform/StateView.kt
index b3d42dc38f..a70bf54aa1 100755
--- a/vector/src/main/java/im/vector/app/core/platform/StateView.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/StateView.kt
@@ -27,7 +27,7 @@ import im.vector.app.core.extensions.updateConstraintSet
 import im.vector.app.databinding.ViewStateBinding
 
 class StateView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0) :
-    FrameLayout(context, attrs, defStyle) {
+        FrameLayout(context, attrs, defStyle) {
 
     sealed class State {
         object Content : State()
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
index 4796022856..fcfd38bccc 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
@@ -46,6 +46,7 @@ import androidx.viewbinding.ViewBinding
 import com.airbnb.mvrx.MavericksView
 import com.bumptech.glide.util.Util
 import com.google.android.material.appbar.MaterialToolbar
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.EntryPointAccessors
 import im.vector.app.BuildConfig
@@ -86,6 +87,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.failure.GlobalError
+import org.matrix.android.sdk.api.failure.InitialSyncRequestReason
 import reactivecircus.flowbinding.android.view.clicks
 import timber.log.Timber
 import javax.inject.Inject
@@ -258,17 +260,37 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
 
     private fun handleGlobalError(globalError: GlobalError) {
         when (globalError) {
-            is GlobalError.InvalidToken         ->
-                handleInvalidToken(globalError)
-            is GlobalError.ConsentNotGivenError ->
-                consentNotGivenHelper.displayDialog(globalError.consentUri,
-                        activeSessionHolder.getActiveSession().sessionParams.homeServerHost ?: "")
-            is GlobalError.CertificateError     ->
-                handleCertificateError(globalError)
+            is GlobalError.InvalidToken         -> handleInvalidToken(globalError)
+            is GlobalError.ConsentNotGivenError -> displayConsentNotGivenDialog(globalError)
+            is GlobalError.CertificateError     -> handleCertificateError(globalError)
             GlobalError.ExpiredAccount          -> Unit // TODO Handle account expiration
+            is GlobalError.InitialSyncRequest   -> handleInitialSyncRequest(globalError)
         }
     }
 
+    private fun displayConsentNotGivenDialog(globalError: GlobalError.ConsentNotGivenError) {
+        consentNotGivenHelper.displayDialog(globalError.consentUri, activeSessionHolder.getActiveSession().sessionParams.homeServerHost ?: "")
+    }
+
+    private fun handleInitialSyncRequest(initialSyncRequest: GlobalError.InitialSyncRequest) {
+        MaterialAlertDialogBuilder(this)
+                .setTitle(R.string.initial_sync_request_title)
+                .setMessage(
+                        getString(
+                                R.string.initial_sync_request_content, getString(
+                                when (initialSyncRequest.reason) {
+                                    InitialSyncRequestReason.IGNORED_USERS_LIST_CHANGE -> R.string.initial_sync_request_reason_unignored_users
+                                }
+                        )
+                        )
+                )
+                .setPositiveButton(R.string.ok) { _, _ ->
+                    MainActivity.restartApp(this, MainActivityArgs(clearCache = true))
+                }
+                .setNegativeButton(R.string.later, null)
+                .show()
+    }
+
     private fun handleCertificateError(certificateError: GlobalError.CertificateError) {
         singletonEntryPoint()
                 .unrecognizedCertificateDialog()
@@ -298,7 +320,8 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
 
         mainActivityStarted = true
 
-        MainActivity.restartApp(this,
+        MainActivity.restartApp(
+                this,
                 MainActivityArgs(
                         clearCredentials = !globalError.softLogout,
                         isUserLoggedOut = true,
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
index 70b265ff9f..7db35a8e8f 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
@@ -83,8 +83,8 @@ abstract class VectorBaseFragment<VB : ViewBinding> : Fragment(), MavericksView
      * [ToolbarConfig] instance from host activity
      * */
     protected var toolbar: ToolbarConfig? = null
-            get() = (activity as? VectorBaseActivity<*>)?.toolbar
-            private set
+        get() = (activity as? VectorBaseActivity<*>)?.toolbar
+        private set
     /* ==========================================================================================
      * View model
      * ========================================================================================== */
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorEventViewModel.kt b/vector/src/main/java/im/vector/app/core/platform/VectorEventViewModel.kt
index 9ab46557a5..2b47412901 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorEventViewModel.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorEventViewModel.kt
@@ -26,4 +26,4 @@ interface VectorSharedAction
  * Parent class to handle navigation events, action events, or other any events
  */
 open class VectorSharedActionViewModel<T : VectorSharedAction>(private val store: MutableDataSource<T> = PublishDataSource()) :
-    ViewModel(), MutableDataSource<T> by store
+        ViewModel(), MutableDataSource<T> by store
diff --git a/vector/src/main/java/im/vector/app/core/preference/KeywordPreference.kt b/vector/src/main/java/im/vector/app/core/preference/KeywordPreference.kt
index b57bb27671..6101f8a597 100644
--- a/vector/src/main/java/im/vector/app/core/preference/KeywordPreference.kt
+++ b/vector/src/main/java/im/vector/app/core/preference/KeywordPreference.kt
@@ -139,7 +139,7 @@ class KeywordPreference : VectorPreference {
                 keyword.contains("/")   -> {
                     context.getString(R.string.settings_notification_keyword_contains_invalid_character, "/")
                 }
-                else -> null
+                else                    -> null
             }
 
             chipTextInputLayout.isErrorEnabled = errorMessage != null
diff --git a/vector/src/main/java/im/vector/app/core/preference/PushRulePreference.kt b/vector/src/main/java/im/vector/app/core/preference/PushRulePreference.kt
index 78266cf5ee..34def7e060 100644
--- a/vector/src/main/java/im/vector/app/core/preference/PushRulePreference.kt
+++ b/vector/src/main/java/im/vector/app/core/preference/PushRulePreference.kt
@@ -56,11 +56,13 @@ class PushRulePreference : VectorPreference {
      * Refresh the summary
      */
     private fun refreshSummary() {
-        summary = context.getString(when (index) {
-            NotificationIndex.OFF         -> R.string.notification_off
-            NotificationIndex.SILENT      -> R.string.notification_silent
-            NotificationIndex.NOISY, null -> R.string.notification_noisy
-        })
+        summary = context.getString(
+                when (index) {
+                    NotificationIndex.OFF         -> R.string.notification_off
+                    NotificationIndex.SILENT      -> R.string.notification_silent
+                    NotificationIndex.NOISY, null -> R.string.notification_noisy
+                }
+        )
     }
 
     override fun onBindViewHolder(holder: PreferenceViewHolder) {
diff --git a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
index 27d6d05708..b1bb4c7d88 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
@@ -37,7 +37,7 @@ class PushersManager @Inject constructor(
     suspend fun testPush(pushKey: String) {
         val currentSession = activeSessionHolder.getActiveSession()
 
-        currentSession.testPush(
+        currentSession.pushersService().testPush(
                 stringProvider.getString(R.string.pusher_http_url),
                 stringProvider.getString(R.string.pusher_app_id),
                 pushKey,
@@ -47,12 +47,12 @@ class PushersManager @Inject constructor(
 
     fun enqueueRegisterPusherWithFcmKey(pushKey: String): UUID {
         val currentSession = activeSessionHolder.getActiveSession()
-        return currentSession.enqueueAddHttpPusher(createHttpPusher(pushKey))
+        return currentSession.pushersService().enqueueAddHttpPusher(createHttpPusher(pushKey))
     }
 
     suspend fun registerPusherWithFcmKey(pushKey: String) {
         val currentSession = activeSessionHolder.getActiveSession()
-        currentSession.addHttpPusher(createHttpPusher(pushKey))
+        currentSession.pushersService().addHttpPusher(createHttpPusher(pushKey))
     }
 
     private fun createHttpPusher(pushKey: String) = PushersService.HttpPusher(
@@ -70,7 +70,7 @@ class PushersManager @Inject constructor(
     suspend fun registerEmailForPush(email: String) {
         val currentSession = activeSessionHolder.getActiveSession()
         val appName = appNameProvider.getAppName()
-        currentSession.addEmailPusher(
+        currentSession.pushersService().addEmailPusher(
                 email = email,
                 lang = localeProvider.current().language,
                 emailBranding = appName,
@@ -81,12 +81,12 @@ class PushersManager @Inject constructor(
 
     suspend fun unregisterEmailPusher(email: String) {
         val currentSession = activeSessionHolder.getSafeActiveSession() ?: return
-        currentSession.removeEmailPusher(email)
+        currentSession.pushersService().removeEmailPusher(email)
     }
 
     suspend fun unregisterPusher(pushKey: String) {
         val currentSession = activeSessionHolder.getSafeActiveSession() ?: return
-        currentSession.removeHttpPusher(pushKey, stringProvider.getString(R.string.pusher_app_id))
+        currentSession.pushersService().removeHttpPusher(pushKey, stringProvider.getString(R.string.pusher_app_id))
     }
 
     companion object {
diff --git a/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt b/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt
index fdb5f21b61..2f1b46b555 100644
--- a/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt
@@ -32,6 +32,6 @@ class LocaleProvider @Inject constructor(private val resources: Resources) {
 
 fun LocaleProvider.isEnglishSpeaking() = current().language.startsWith("en")
 
-fun LocaleProvider.getLayoutDirectionFromCurrentLocale() =  TextUtils.getLayoutDirectionFromLocale(current())
+fun LocaleProvider.getLayoutDirectionFromCurrentLocale() = TextUtils.getLayoutDirectionFromLocale(current())
 
 fun LocaleProvider.isRTL() = getLayoutDirectionFromCurrentLocale() == View.LAYOUT_DIRECTION_RTL
diff --git a/vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt b/vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt
index b2d9382aae..702092679f 100644
--- a/vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt
+++ b/vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt
@@ -140,13 +140,15 @@ class CallRingPlayerOutgoing(
             mediaPlayer.setOnErrorListener(MediaPlayerErrorListener())
             mediaPlayer.isLooping = true
             if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
-                mediaPlayer.setAudioAttributes(AudioAttributes.Builder()
-                        .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
-                        .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
-                        // TODO Change to ?
-                        // .setContentType(AudioAttributes.CONTENT_TYPE_UNKNOWN)
-                        // .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
-                        .build())
+                mediaPlayer.setAudioAttributes(
+                        AudioAttributes.Builder()
+                                .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
+                                .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
+                                // TODO Change to ?
+                                // .setContentType(AudioAttributes.CONTENT_TYPE_UNKNOWN)
+                                // .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
+                                .build()
+                )
             } else {
                 @Suppress("DEPRECATION")
                 mediaPlayer.setAudioStreamType(AudioManager.STREAM_RING)
diff --git a/vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt b/vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt
index 5dbea8dcc4..131276bea6 100644
--- a/vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt
+++ b/vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt
@@ -33,6 +33,8 @@ import androidx.work.WorkerParameters
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.platform.PendingIntentCompat
+import im.vector.app.core.time.Clock
+import im.vector.app.core.time.DefaultClock
 import im.vector.app.features.notifications.NotificationUtils
 import im.vector.app.features.settings.BackgroundSyncMode
 import org.matrix.android.sdk.api.Matrix
@@ -77,6 +79,7 @@ class VectorSyncService : SyncService() {
 
     @Inject lateinit var notificationUtils: NotificationUtils
     @Inject lateinit var matrix: Matrix
+    @Inject lateinit var clock: Clock
 
     override fun provideMatrix() = matrix
 
@@ -102,7 +105,8 @@ class VectorSyncService : SyncService() {
                 syncTimeoutSeconds = syncTimeoutSeconds,
                 syncDelaySeconds = syncDelaySeconds,
                 isPeriodic = true,
-                isNetworkBack = false
+                isNetworkBack = false,
+                currentTimeMillis = clock.epochMillis()
         )
     }
 
@@ -114,9 +118,10 @@ class VectorSyncService : SyncService() {
         val rescheduleSyncWorkRequest: WorkRequest =
                 OneTimeWorkRequestBuilder<RestartWhenNetworkOn>()
                         .setInputData(RestartWhenNetworkOn.createInputData(sessionId, syncTimeoutSeconds, syncDelaySeconds, isPeriodic))
-                        .setConstraints(Constraints.Builder()
-                                .setRequiredNetworkType(NetworkType.CONNECTED)
-                                .build()
+                        .setConstraints(
+                                Constraints.Builder()
+                                        .setRequiredNetworkType(NetworkType.CONNECTED)
+                                        .build()
                         )
                         .build()
 
@@ -137,20 +142,27 @@ class VectorSyncService : SyncService() {
     }
 
     // I do not move or rename this class, since I'm not sure about the side effect regarding the WorkManager
-    class RestartWhenNetworkOn(appContext: Context, workerParams: WorkerParameters) :
-            Worker(appContext, workerParams) {
+    class RestartWhenNetworkOn(
+            appContext: Context,
+            workerParams: WorkerParameters
+    ) : Worker(appContext, workerParams) {
+
         override fun doWork(): Result {
             Timber.d("## Sync: RestartWhenNetworkOn.doWork()")
             val sessionId = inputData.getString(KEY_SESSION_ID) ?: return Result.failure()
             val syncTimeoutSeconds = inputData.getInt(KEY_SYNC_TIMEOUT_SECONDS, BackgroundSyncMode.DEFAULT_SYNC_TIMEOUT_SECONDS)
             val syncDelaySeconds = inputData.getInt(KEY_SYNC_DELAY_SECONDS, BackgroundSyncMode.DEFAULT_SYNC_DELAY_SECONDS)
             val isPeriodic = inputData.getBoolean(KEY_IS_PERIODIC, false)
+
+            // Not sure how to inject a Clock here
+            val clock = DefaultClock()
             applicationContext.rescheduleSyncService(
                     sessionId = sessionId,
                     syncTimeoutSeconds = syncTimeoutSeconds,
                     syncDelaySeconds = syncDelaySeconds,
                     isPeriodic = isPeriodic,
-                    isNetworkBack = true
+                    isNetworkBack = true,
+                    currentTimeMillis = clock.epochMillis()
             )
             // Indicate whether the work finished successfully with the Result
             return Result.success()
@@ -182,7 +194,8 @@ private fun Context.rescheduleSyncService(sessionId: String,
                                           syncTimeoutSeconds: Int,
                                           syncDelaySeconds: Int,
                                           isPeriodic: Boolean,
-                                          isNetworkBack: Boolean) {
+                                          isNetworkBack: Boolean,
+                                          currentTimeMillis: Long) {
     Timber.d("## Sync: rescheduleSyncService")
     val intent = if (isPeriodic) {
         VectorSyncService.newPeriodicIntent(
@@ -208,7 +221,7 @@ private fun Context.rescheduleSyncService(sessionId: String,
         } else {
             PendingIntent.getService(this, 0, intent, PendingIntentCompat.FLAG_IMMUTABLE)
         }
-        val firstMillis = System.currentTimeMillis() + syncDelaySeconds * 1000L
+        val firstMillis = currentTimeMillis + syncDelaySeconds * 1000L
         val alarmMgr = getSystemService<AlarmManager>()!!
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             alarmMgr.setAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, firstMillis, pendingIntent)
diff --git a/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericController.kt b/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericController.kt
index 6e92549809..70faa87645 100644
--- a/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericController.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericController.kt
@@ -21,7 +21,7 @@ import com.airbnb.epoxy.TypedEpoxyController
  * Epoxy controller for generic bottom sheet actions
  */
 abstract class BottomSheetGenericController<State : BottomSheetGenericState, Action : BottomSheetGenericRadioAction> :
-    TypedEpoxyController<State>() {
+        TypedEpoxyController<State>() {
 
     var listener: Listener<Action>? = null
 
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/CompatKonfetti.kt b/vector/src/main/java/im/vector/app/core/ui/views/CompatKonfetti.kt
new file mode 100644
index 0000000000..6b969fe2a5
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/ui/views/CompatKonfetti.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.ui.views
+
+import android.content.Context
+import android.os.Build
+import android.util.AttributeSet
+import android.view.View
+import nl.dionsegijn.konfetti.xml.KonfettiView
+
+/**
+ * Konfetti workaround to avoid crashes on API 21/22
+ * https://github.com/DanielMartinus/Konfetti/issues/297
+ */
+class CompatKonfetti @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null
+) : KonfettiView(context, attrs) {
+
+    override fun onVisibilityChanged(changedView: View, visibility: Int) {
+        when (Build.VERSION.SDK_INT) {
+            Build.VERSION_CODES.LOLLIPOP, Build.VERSION_CODES.LOLLIPOP_MR1 -> safeOnVisibilityChanged(changedView, visibility)
+            else                                                           -> super.onVisibilityChanged(changedView, visibility)
+        }
+    }
+
+    private fun safeOnVisibilityChanged(changedView: View, visibility: Int) {
+        runCatching { super.onVisibilityChanged(changedView, visibility) }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt b/vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt
index a984707bf7..39bfce6975 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt
@@ -36,7 +36,7 @@ class PasswordStrengthBar @JvmOverloads constructor(
         context: Context,
         attrs: AttributeSet? = null,
         defStyleAttr: Int = 0) :
-    LinearLayout(context, attrs, defStyleAttr) {
+        LinearLayout(context, attrs, defStyleAttr) {
 
     private val views: ViewPasswordStrengthBarBinding
 
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt b/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
index 3a79e7e328..8477eddeea 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
@@ -107,11 +107,13 @@ class ReadReceiptsView @JvmOverloads constructor(
                 else ->
                     if (displayNames.size >= 2) {
                         val qty = readReceipts.size - 2
-                        context.resources.getQuantityString(R.plurals.two_and_some_others_read,
+                        context.resources.getQuantityString(
+                                R.plurals.two_and_some_others_read,
                                 qty,
                                 displayNames[0],
                                 displayNames[1],
-                                qty)
+                                qty
+                        )
                     } else {
                         context.resources.getQuantityString(R.plurals.fallback_users_read, readReceipts.size)
                     }
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/TypingMessageDotsView.kt b/vector/src/main/java/im/vector/app/core/ui/views/TypingMessageDotsView.kt
index bc06254b0d..2e9945c8d7 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/TypingMessageDotsView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/TypingMessageDotsView.kt
@@ -30,7 +30,7 @@ import androidx.core.view.setMargins
 import im.vector.app.R
 
 class TypingMessageDotsView(context: Context, attrs: AttributeSet) :
-    LinearLayout(context, attrs) {
+        LinearLayout(context, attrs) {
 
     companion object {
         const val DEFAULT_CIRCLE_DURATION = 1000L
diff --git a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
index a9375b6545..d961dcaa46 100644
--- a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
@@ -147,8 +147,11 @@ fun openFileSelection(activity: Activity,
  * Send an email to address with optional subject and message
  */
 fun sendMailTo(address: String, subject: String? = null, message: String? = null, activity: Activity) {
-    val intent = Intent(Intent.ACTION_SENDTO, Uri.fromParts(
-            "mailto", address, null))
+    val intent = Intent(
+            Intent.ACTION_SENDTO, Uri.fromParts(
+            "mailto", address, null
+    )
+    )
     intent.putExtra(Intent.EXTRA_SUBJECT, subject)
     intent.putExtra(Intent.EXTRA_TEXT, message)
 
@@ -248,7 +251,12 @@ private fun appendTimeToFilename(name: String): String {
     return """${filename}_$dateExtension.$fileExtension"""
 }
 
-suspend fun saveMedia(context: Context, file: File, title: String, mediaMimeType: String?, notificationUtils: NotificationUtils) {
+suspend fun saveMedia(context: Context,
+                      file: File,
+                      title: String,
+                      mediaMimeType: String?,
+                      notificationUtils: NotificationUtils,
+                      currentTimeMillis: Long) {
     withContext(Dispatchers.IO) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             val filename = appendTimeToFilename(title)
@@ -257,8 +265,8 @@ suspend fun saveMedia(context: Context, file: File, title: String, mediaMimeType
                 put(MediaStore.Images.Media.TITLE, filename)
                 put(MediaStore.Images.Media.DISPLAY_NAME, filename)
                 put(MediaStore.Images.Media.MIME_TYPE, mediaMimeType)
-                put(MediaStore.Images.Media.DATE_ADDED, System.currentTimeMillis())
-                put(MediaStore.Images.Media.DATE_TAKEN, System.currentTimeMillis())
+                put(MediaStore.Images.Media.DATE_ADDED, currentTimeMillis)
+                put(MediaStore.Images.Media.DATE_TAKEN, currentTimeMillis)
             }
             val externalContentUri = when {
                 mediaMimeType?.isMimeTypeImage() == true -> MediaStore.Images.Media.EXTERNAL_CONTENT_URI
@@ -289,7 +297,7 @@ suspend fun saveMedia(context: Context, file: File, title: String, mediaMimeType
                 }
             }
         } else {
-            saveMediaLegacy(context, mediaMimeType, title, file)
+            saveMediaLegacy(context, mediaMimeType, title, file, currentTimeMillis)
         }
     }
 }
@@ -298,7 +306,8 @@ suspend fun saveMedia(context: Context, file: File, title: String, mediaMimeType
 private fun saveMediaLegacy(context: Context,
                             mediaMimeType: String?,
                             title: String,
-                            file: File) {
+                            file: File,
+                            currentTimeMillis: Long) {
     val state = Environment.getExternalStorageState()
     if (Environment.MEDIA_MOUNTED != state) {
         context.toast(context.getString(R.string.error_saving_media_file))
@@ -319,7 +328,7 @@ private fun saveMediaLegacy(context: Context,
         } else {
             title
         }
-        val savedFile = saveFileIntoLegacy(file, downloadDir, outputFilename)
+        val savedFile = saveFileIntoLegacy(file, downloadDir, outputFilename, currentTimeMillis)
         if (savedFile != null) {
             val downloadManager = context.getSystemService<DownloadManager>()
             downloadManager?.addCompletedDownload(
@@ -329,7 +338,8 @@ private fun saveMediaLegacy(context: Context,
                     mediaMimeType ?: MimeTypes.OctetStream,
                     savedFile.absolutePath,
                     savedFile.length(),
-                    true)
+                    true
+            )
             addToGallery(savedFile, mediaMimeType, context)
         }
     } catch (error: Throwable) {
@@ -408,10 +418,11 @@ fun selectTxtFileToWrite(
  * @param sourceFile     the file source path
  * @param dstDirPath     the dst path
  * @param outputFilename optional the output filename
+ * @param currentTimeMillis the current time in milliseconds
  * @return               the created file
  */
 @Suppress("DEPRECATION")
-fun saveFileIntoLegacy(sourceFile: File, dstDirPath: File, outputFilename: String?): File? {
+fun saveFileIntoLegacy(sourceFile: File, dstDirPath: File, outputFilename: String?, currentTimeMillis: Long): File? {
     // defines another name for the external media
     var dstFileName: String
 
@@ -423,7 +434,7 @@ fun saveFileIntoLegacy(sourceFile: File, dstDirPath: File, outputFilename: Strin
         if (dotPos > 0) {
             fileExt = sourceFile.name.substring(dotPos)
         }
-        dstFileName = "vector_" + System.currentTimeMillis() + fileExt
+        dstFileName = "vector_$currentTimeMillis$fileExt"
     } else {
         dstFileName = outputFilename
     }
diff --git a/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
index 1fa2b8151a..f8ff12ddb2 100644
--- a/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
@@ -43,21 +43,20 @@ import im.vector.app.features.notifications.NotificationUtils
  * This user option appears on Android M but Android O enforces its usage and kills apps not
  * authorised by the user to run in background.
  *
- * @param context the context
  * @return true if battery optimisations are ignored
  */
-fun isIgnoringBatteryOptimizations(context: Context): Boolean {
+fun Context.isIgnoringBatteryOptimizations(): Boolean {
     // no issue before Android M, battery optimisations did not exist
     return Build.VERSION.SDK_INT < Build.VERSION_CODES.M ||
-            context.getSystemService<PowerManager>()?.isIgnoringBatteryOptimizations(context.packageName) == true
+            getSystemService<PowerManager>()?.isIgnoringBatteryOptimizations(packageName) == true
 }
 
-fun isAirplaneModeOn(context: Context): Boolean {
-    return Settings.Global.getInt(context.contentResolver, Settings.Global.AIRPLANE_MODE_ON, 0) != 0
+fun Context.isAirplaneModeOn(): Boolean {
+    return Settings.Global.getInt(contentResolver, Settings.Global.AIRPLANE_MODE_ON, 0) != 0
 }
 
-fun isAnimationDisabled(context: Context): Boolean {
-    return Settings.Global.getFloat(context.contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, 1f) == 0f
+fun Context.isAnimationEnabled(): Boolean {
+    return Settings.Global.getFloat(contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, 1f) != 0f
 }
 
 /**
diff --git a/vector/src/main/java/im/vector/app/features/MainActivity.kt b/vector/src/main/java/im/vector/app/features/MainActivity.kt
index 42bd2318b3..121edd4216 100644
--- a/vector/src/main/java/im/vector/app/features/MainActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt
@@ -160,7 +160,7 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
             args.clearCredentials     -> {
                 lifecycleScope.launch {
                     try {
-                        session.signOut(!args.isUserLoggedOut)
+                        session.signOutService().signOut(!args.isUserLoggedOut)
                     } catch (failure: Throwable) {
                         displayError(failure)
                         return@launch
diff --git a/vector/src/main/java/im/vector/app/features/VectorFeatures.kt b/vector/src/main/java/im/vector/app/features/VectorFeatures.kt
index b2a62a42d3..42693a53f9 100644
--- a/vector/src/main/java/im/vector/app/features/VectorFeatures.kt
+++ b/vector/src/main/java/im/vector/app/features/VectorFeatures.kt
@@ -27,6 +27,7 @@ interface VectorFeatures {
     fun isOnboardingPersonalizeEnabled(): Boolean
     fun isOnboardingCombinedRegisterEnabled(): Boolean
     fun isLiveLocationEnabled(): Boolean
+    fun isScreenSharingEnabled(): Boolean
 
     enum class OnboardingVariant {
         LEGACY,
@@ -43,4 +44,5 @@ class DefaultVectorFeatures : VectorFeatures {
     override fun isOnboardingPersonalizeEnabled() = false
     override fun isOnboardingCombinedRegisterEnabled() = false
     override fun isLiveLocationEnabled(): Boolean = false
+    override fun isScreenSharingEnabled(): Boolean = true
 }
diff --git a/vector/src/main/java/im/vector/app/features/analytics/DecryptionFailureTracker.kt b/vector/src/main/java/im/vector/app/features/analytics/DecryptionFailureTracker.kt
index 6b2ceb1444..ec34ff7421 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/DecryptionFailureTracker.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/DecryptionFailureTracker.kt
@@ -38,6 +38,7 @@ private data class DecryptionFailure(
         val failedEventId: String,
         val error: MXCryptoError.ErrorType
 )
+private typealias DetailedErrorName = Pair<String, Error.Name>
 
 private const val GRACE_PERIOD_MILLIS = 4_000
 private const val CHECK_INTERVAL = 2_000L
@@ -112,7 +113,7 @@ class DecryptionFailureTracker @Inject constructor(
 
     private fun checkFailures() {
         val now = clock.epochMillis()
-        val aggregatedErrors: Map<Error.Name, List<String>>
+        val aggregatedErrors: Map<DetailedErrorName, List<String>>
         synchronized(failures) {
             val toReport = mutableListOf<DecryptionFailure>()
             failures.removeAll { failure ->
@@ -136,20 +137,21 @@ class DecryptionFailureTracker @Inject constructor(
                     // for now we ignore events already reported even if displayed again?
                     .filter { alreadyReported.contains(it).not() }
                     .forEach { failedEventId ->
-                        analyticsTracker.capture(Error(failedEventId, Error.Domain.E2EE, aggregation.key))
+                        analyticsTracker.capture(Error(aggregation.key.first, Error.Domain.E2EE, aggregation.key.second))
                         alreadyReported.add(failedEventId)
                     }
         }
     }
 
-    private fun MXCryptoError.ErrorType.toAnalyticsErrorName(): Error.Name {
-        return when (this) {
-            MXCryptoError.ErrorType.UNKNOWN_INBOUND_SESSION_ID -> Error.Name.OlmKeysNotSentError
-            MXCryptoError.ErrorType.OLM                        -> {
-                Error.Name.OlmUnspecifiedError
-            }
-            MXCryptoError.ErrorType.UNKNOWN_MESSAGE_INDEX      -> Error.Name.OlmIndexError
-            else                                               -> Error.Name.UnknownError
+    private fun MXCryptoError.ErrorType.toAnalyticsErrorName(): DetailedErrorName {
+        val detailed = "$name | mxc_crypto_error_type"
+        val errorName = when (this) {
+            MXCryptoError.ErrorType.UNKNOWN_INBOUND_SESSION_ID,
+            MXCryptoError.ErrorType.KEYS_WITHHELD         -> Error.Name.OlmKeysNotSentError
+            MXCryptoError.ErrorType.OLM                   -> Error.Name.OlmUnspecifiedError
+            MXCryptoError.ErrorType.UNKNOWN_MESSAGE_INDEX -> Error.Name.OlmIndexError
+            else                                          -> Error.Name.UnknownError
         }
+        return DetailedErrorName(detailed, errorName)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/analytics/accountdata/AnalyticsAccountDataViewModel.kt b/vector/src/main/java/im/vector/app/features/analytics/accountdata/AnalyticsAccountDataViewModel.kt
index 3b92e7c4de..221a9d8843 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/accountdata/AnalyticsAccountDataViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/accountdata/AnalyticsAccountDataViewModel.kt
@@ -66,7 +66,7 @@ class AnalyticsAccountDataViewModel @AssistedInject constructor(
 
     private fun observeInitSync() {
         combine(
-                session.getSyncStatusLive().asFlow(),
+                session.syncStatusService().getSyncStatusLive().asFlow(),
                 analytics.getUserConsent(),
                 analytics.getAnalyticsId()
         ) { status, userConsent, analyticsId ->
diff --git a/vector/src/main/java/im/vector/app/features/analytics/extensions/JoinedRoomExt.kt b/vector/src/main/java/im/vector/app/features/analytics/extensions/JoinedRoomExt.kt
index c13f8295f2..27ce3e9a23 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/extensions/JoinedRoomExt.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/extensions/JoinedRoomExt.kt
@@ -33,18 +33,20 @@ fun Int?.toAnalyticsRoomSize(): JoinedRoom.RoomSize {
     }
 }
 
-fun RoomSummary?.toAnalyticsJoinedRoom(): JoinedRoom {
+fun RoomSummary?.toAnalyticsJoinedRoom(trigger: JoinedRoom.Trigger?): JoinedRoom {
     return JoinedRoom(
             isDM = this?.isDirect.orFalse(),
             isSpace = this?.roomType == RoomType.SPACE,
-            roomSize = this?.joinedMembersCount?.toAnalyticsRoomSize() ?: JoinedRoom.RoomSize.Two
+            roomSize = this?.joinedMembersCount?.toAnalyticsRoomSize() ?: JoinedRoom.RoomSize.Two,
+            trigger = trigger
     )
 }
 
-fun PublicRoom.toAnalyticsJoinedRoom(): JoinedRoom {
+fun PublicRoom.toAnalyticsJoinedRoom(trigger: JoinedRoom.Trigger?): JoinedRoom {
     return JoinedRoom(
             isDM = false,
             isSpace = false,
-            roomSize = numJoinedMembers.toAnalyticsRoomSize()
+            roomSize = numJoinedMembers.toAnalyticsRoomSize(),
+            trigger = trigger
     )
 }
diff --git a/vector/src/main/java/im/vector/app/features/analytics/extensions/ViewRoomExt.kt b/vector/src/main/java/im/vector/app/features/analytics/extensions/ViewRoomExt.kt
new file mode 100644
index 0000000000..ada936a3b5
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/analytics/extensions/ViewRoomExt.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.analytics.extensions
+
+import im.vector.app.RoomGroupingMethod
+import im.vector.app.features.analytics.plan.ViewRoom
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.RoomType
+
+fun RoomSummary?.toAnalyticsViewRoom(trigger: ViewRoom.Trigger?, groupingMethod: RoomGroupingMethod? = null, viaKeyboard: Boolean? = null): ViewRoom {
+    val activeSpace = groupingMethod?.let {
+        when (it) {
+            is RoomGroupingMethod.BySpace -> it.spaceSummary?.toActiveSpace() ?: ViewRoom.ActiveSpace.Home
+            else                          -> null
+        }
+    }
+
+    return ViewRoom(
+            isDM = this?.isDirect.orFalse(),
+            isSpace = this?.roomType == RoomType.SPACE,
+            trigger = trigger,
+            activeSpace = activeSpace,
+            viaKeyboard = viaKeyboard
+    )
+}
+
+private fun RoomSummary.toActiveSpace(): ViewRoom.ActiveSpace {
+    return if (isPublic) ViewRoom.ActiveSpace.Public else ViewRoom.ActiveSpace.Private
+}
diff --git a/vector/src/main/java/im/vector/app/features/analytics/plan/Interaction.kt b/vector/src/main/java/im/vector/app/features/analytics/plan/Interaction.kt
index 2007f75fbc..4e4bfe53be 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/plan/Interaction.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/plan/Interaction.kt
@@ -87,12 +87,30 @@ data class Interaction(
          */
         WebAddExistingToSpaceDialogCreateRoomButton,
 
+        /**
+         * User clicked the create DM button in the home page of Element
+         * Web/Desktop.
+         */
+        WebHomeCreateChatButton,
+
         /**
          * User clicked the create room button in the home page of Element
          * Web/Desktop.
          */
         WebHomeCreateRoomButton,
 
+        /**
+         * User clicked the explore rooms button in the home page of Element
+         * Web/Desktop.
+         */
+        WebHomeExploreRoomsButton,
+
+        /**
+         * User clicked the explore rooms button next to the search field at the
+         * top of the left panel in Element Web/Desktop.
+         */
+        WebLeftPanelExploreRoomsButton,
+
         /**
          * User interacted with pin to sidebar checkboxes in the quick settings
          * menu of Element Web/Desktop.
@@ -189,6 +207,12 @@ data class Interaction(
          */
         WebRoomHeaderContextMenuSettingsItem,
 
+        /**
+         * User clicked the create DM button in the + context menu of the room
+         * list header in Element Web/Desktop.
+         */
+        WebRoomListHeaderPlusMenuCreateChatItem,
+
         /**
          * User clicked the create room button in the + context menu of the room
          * list header in Element Web/Desktop.
@@ -231,6 +255,12 @@ data class Interaction(
          */
         WebRoomListRoomTileNotificationsMenu,
 
+        /**
+         * User clicked the create DM button in the + context menu of the rooms
+         * sublist in Element Web/Desktop.
+         */
+        WebRoomListRoomsSublistPlusMenuCreateChatItem,
+
         /**
          * User clicked the create room button in the + context menu of the
          * rooms sublist in Element Web/Desktop.
diff --git a/vector/src/main/java/im/vector/app/features/analytics/plan/JoinedRoom.kt b/vector/src/main/java/im/vector/app/features/analytics/plan/JoinedRoom.kt
index 0011d0e144..06cefa702e 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/plan/JoinedRoom.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/plan/JoinedRoom.kt
@@ -49,11 +49,6 @@ data class JoinedRoom(
          */
         Invite,
 
-        /**
-         * Room joined via space explore
-         */
-        MobileExploreRooms,
-
         /**
          * Room joined via link
          */
diff --git a/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInFragment.kt b/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInFragment.kt
index f112ba4659..320386aebd 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInFragment.kt
@@ -31,7 +31,7 @@ import im.vector.app.databinding.FragmentAnalyticsOptinBinding
 import javax.inject.Inject
 
 class AnalyticsOptInFragment @Inject constructor() :
-    VectorBaseFragment<FragmentAnalyticsOptinBinding>(),
+        VectorBaseFragment<FragmentAnalyticsOptinBinding>(),
         OnBackPressed {
 
     // Share the view model with the Activity so that the Activity
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
index 98440632d8..6734744c29 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
@@ -140,22 +140,26 @@ class AttachmentTypeSelectorView(context: Context,
 
     private fun animateWindowInCircular(anchor: View, contentView: View) {
         val coordinates = getClickCoordinates(anchor, contentView)
-        val animator = ViewAnimationUtils.createCircularReveal(contentView,
+        val animator = ViewAnimationUtils.createCircularReveal(
+                contentView,
                 coordinates.first,
                 coordinates.second,
                 0f,
-                max(contentView.width, contentView.height).toFloat())
+                max(contentView.width, contentView.height).toFloat()
+        )
         animator.duration = ANIMATION_DURATION.toLong()
         animator.start()
     }
 
     private fun animateWindowOutCircular(anchor: View, contentView: View) {
         val coordinates = getClickCoordinates(anchor, contentView)
-        val animator = ViewAnimationUtils.createCircularReveal(getContentView(),
+        val animator = ViewAnimationUtils.createCircularReveal(
+                getContentView(),
                 coordinates.first,
                 coordinates.second,
                 max(getContentView().width, getContentView().height).toFloat(),
-                0f)
+                0f
+        )
 
         animator.duration = ANIMATION_DURATION.toLong()
         animator.addListener(object : AnimatorListenerAdapter() {
diff --git a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt
index 5b9c3f7fb4..729ac10d4b 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt
@@ -45,6 +45,7 @@ import im.vector.app.core.extensions.insertBeforeLast
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.time.Clock
 import im.vector.app.core.utils.OnSnapPositionChangeListener
 import im.vector.app.core.utils.SnapOnScrollListener
 import im.vector.app.core.utils.attachSnapHelperWithListener
@@ -64,7 +65,8 @@ data class AttachmentsPreviewArgs(
 class AttachmentsPreviewFragment @Inject constructor(
         private val attachmentMiniaturePreviewController: AttachmentMiniaturePreviewController,
         private val attachmentBigPreviewController: AttachmentBigPreviewController,
-        private val colorProvider: ColorProvider
+        private val colorProvider: ColorProvider,
+        private val clock: Clock,
 ) : VectorBaseFragment<FragmentAttachmentsPreviewBinding>(), AttachmentMiniaturePreviewController.Callback {
 
     private val fragmentArgs: AttachmentsPreviewArgs by args()
@@ -192,7 +194,7 @@ class AttachmentsPreviewFragment @Inject constructor(
 
     private fun handleEditAction() = withState(viewModel) {
         val currentAttachment = it.attachments.getOrNull(it.currentAttachmentIndex) ?: return@withState
-        val destinationFile = File(requireContext().cacheDir, currentAttachment.name.insertBeforeLast("_edited_image_${System.currentTimeMillis()}"))
+        val destinationFile = File(requireContext().cacheDir, currentAttachment.name.insertBeforeLast("_edited_image_${clock.epochMillis()}"))
         val uri = currentAttachment.queryUri
         createUCropWithDefaultSettings(colorProvider, uri, destinationFile.toUri(), currentAttachment.name)
                 .getIntent(requireContext())
diff --git a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewModel.kt
index 3e9d72e98b..81f0994899 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewModel.kt
@@ -20,7 +20,7 @@ package im.vector.app.features.attachments.preview
 import im.vector.app.core.platform.VectorViewModel
 
 class AttachmentsPreviewViewModel(initialState: AttachmentsPreviewViewState) :
-    VectorViewModel<AttachmentsPreviewViewState, AttachmentsPreviewAction, AttachmentsPreviewViewEvents>(initialState) {
+        VectorViewModel<AttachmentsPreviewViewState, AttachmentsPreviewAction, AttachmentsPreviewViewEvents>(initialState) {
 
     override fun handle(action: AttachmentsPreviewAction) {
         when (action) {
diff --git a/vector/src/main/java/im/vector/app/features/auth/PromptFragment.kt b/vector/src/main/java/im/vector/app/features/auth/PromptFragment.kt
index 501af00ad2..bd44a5b9cd 100644
--- a/vector/src/main/java/im/vector/app/features/auth/PromptFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/auth/PromptFragment.kt
@@ -65,7 +65,7 @@ class PromptFragment : VectorBaseFragment<FragmentReauthConfirmBinding>() {
 
     override fun invalidate() = withState(viewModel) {
         when (it.flowType) {
-            LoginFlowTypes.SSO -> {
+            LoginFlowTypes.SSO      -> {
                 views.passwordFieldTil.isVisible = false
                 views.reAuthConfirmButton.text = getString(R.string.auth_login_sso)
             }
diff --git a/vector/src/main/java/im/vector/app/features/auth/ReAuthActivity.kt b/vector/src/main/java/im/vector/app/features/auth/ReAuthActivity.kt
index 78c6cbb021..f92ec8ea9e 100644
--- a/vector/src/main/java/im/vector/app/features/auth/ReAuthActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/auth/ReAuthActivity.kt
@@ -86,10 +86,10 @@ class ReAuthActivity : SimpleFragmentActivity() {
 
         sharedViewModel.observeViewEvents {
             when (it) {
-                is ReAuthEvents.OpenSsoURl -> {
+                is ReAuthEvents.OpenSsoURl            -> {
                     openInCustomTab(it.url)
                 }
-                ReAuthEvents.Dismiss -> {
+                ReAuthEvents.Dismiss                  -> {
                     setResult(RESULT_CANCELED)
                     finish()
                 }
@@ -205,7 +205,7 @@ class ReAuthActivity : SimpleFragmentActivity() {
                 LoginFlowTypes.PASSWORD -> {
                     LoginFlowTypes.PASSWORD
                 }
-                LoginFlowTypes.SSO -> {
+                LoginFlowTypes.SSO      -> {
                     LoginFlowTypes.SSO
                 }
                 else                    -> {
diff --git a/vector/src/main/java/im/vector/app/features/auth/ReAuthViewModel.kt b/vector/src/main/java/im/vector/app/features/auth/ReAuthViewModel.kt
index fcc2a59ef8..0bd26870e5 100644
--- a/vector/src/main/java/im/vector/app/features/auth/ReAuthViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/auth/ReAuthViewModel.kt
@@ -42,7 +42,7 @@ class ReAuthViewModel @AssistedInject constructor(
 
     override fun handle(action: ReAuthActions) = withState { state ->
         when (action) {
-            ReAuthActions.StartSSOFallback -> {
+            ReAuthActions.StartSSOFallback   -> {
                 if (state.flowType == LoginFlowTypes.SSO) {
                     setState { copy(ssoFallbackPageWasShown = true) }
                     val ssoURL = session.getUiaSsoFallbackUrl(initialState.session ?: "")
@@ -55,10 +55,10 @@ class ReAuthViewModel @AssistedInject constructor(
             ReAuthActions.FallBackPageClosed -> {
                 // Should we do something here?
             }
-            is ReAuthActions.ReAuthWithPass -> {
+            is ReAuthActions.ReAuthWithPass  -> {
                 val safeForIntentCypher = ByteArrayOutputStream().also {
                     it.use {
-                        session.securelyStoreObject(action.password, initialState.resultKeyStoreAlias, it)
+                        session.secureStorageService().securelyStoreObject(action.password, initialState.resultKeyStoreAlias, it)
                     }
                 }.toByteArray().toBase64NoPadding()
                 _viewEvents.post(ReAuthEvents.PasswordFinishSuccess(safeForIntentCypher))
diff --git a/vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupPresenter.kt
index a3c276c977..fc7479eb21 100644
--- a/vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupPresenter.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupPresenter.kt
@@ -55,7 +55,7 @@ class AutocompleteGroupPresenter @Inject constructor(context: Context,
                 QueryStringValue.Contains(query.toString(), QueryStringValue.Case.INSENSITIVE)
             }
         }
-        val groups = session.getGroupSummaries(queryParams)
+        val groups = session.groupService().getGroupSummaries(queryParams)
                 .asSequence()
                 .sortedBy { it.displayName }
         controller.setData(groups.toList())
diff --git a/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt
index ce3b9c6a7e..88d015ec0c 100644
--- a/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt
@@ -24,10 +24,11 @@ import dagger.assisted.AssistedInject
 import im.vector.app.R
 import im.vector.app.features.autocomplete.AutocompleteClickListener
 import im.vector.app.features.autocomplete.RecyclerViewPresenter
-import org.matrix.android.sdk.api.pushrules.SenderNotificationPermissionCondition
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.pushrules.SenderNotificationPermissionCondition
 import org.matrix.android.sdk.api.session.room.members.RoomMemberQueryParams
 import org.matrix.android.sdk.api.session.room.members.roomMemberQueryParams
 import org.matrix.android.sdk.api.session.room.model.Membership
@@ -126,7 +127,8 @@ class AutocompleteMemberPresenter @AssistedInject constructor(context: Context,
             )
 
     private fun createMemberItems(queryParams: RoomMemberQueryParams) =
-            room.getRoomMembers(queryParams)
+            room.membershipService()
+                    .getRoomMembers(queryParams)
                     .asSequence()
                     .sortedBy { it.displayName }
                     .disambiguate()
@@ -147,7 +149,7 @@ class AutocompleteMemberPresenter @AssistedInject constructor(context: Context,
                         AutocompleteMemberItem.Everyone(it)
                     }
 
-    private fun canNotifyEveryone() = session.resolveSenderNotificationPermissionCondition(
+    private fun canNotifyEveryone() = session.pushRuleService().resolveSenderNotificationPermissionCondition(
             Event(
                     senderId = session.myUserId,
                     roomId = roomId
diff --git a/vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomPresenter.kt
index 99f0af7184..d9310e295d 100644
--- a/vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomPresenter.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomPresenter.kt
@@ -51,7 +51,7 @@ class AutocompleteRoomPresenter @Inject constructor(context: Context,
                 QueryStringValue.Contains(query.toString(), QueryStringValue.Case.INSENSITIVE)
             }
         }
-        val rooms = session.getRoomSummaries(queryParams)
+        val rooms = session.roomService().getRoomSummaries(queryParams)
                 .asSequence()
                 .sortedBy { it.displayName }
         controller.setData(rooms.toList())
diff --git a/vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt
index e38b53c858..11a43bcd0c 100644
--- a/vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt
@@ -27,6 +27,8 @@ import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.databinding.BottomSheetCallControlsBinding
+import im.vector.app.features.VectorFeatures
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class CallControlsBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetCallControlsBinding>() {
@@ -34,6 +36,8 @@ class CallControlsBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetC
         return BottomSheetCallControlsBinding.inflate(inflater, container, false)
     }
 
+    @Inject lateinit var vectorFeatures: VectorFeatures
+
     private val callViewModel: VectorCallViewModel by activityViewModel()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -66,6 +70,12 @@ class CallControlsBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetC
             callViewModel.handle(VectorCallViewActions.InitiateCallTransfer)
             dismiss()
         }
+
+        views.callControlsShareScreen.isVisible = vectorFeatures.isScreenSharingEnabled()
+        views.callControlsShareScreen.views.bottomSheetActionClickableZone.debouncedClicks {
+            callViewModel.handle(VectorCallViewActions.ToggleScreenSharing)
+            dismiss()
+        }
     }
 
     private fun renderState(state: VectorCallViewState) {
@@ -95,5 +105,6 @@ class CallControlsBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetC
             views.callControlsToggleHoldResume.leftIcon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_call_hold_action)
         }
         views.callControlsTransfer.isVisible = state.canOpponentBeTransferred
+        views.callControlsShareScreen.title = getString(if (state.isSharingScreen) R.string.call_stop_screen_sharing else R.string.call_start_screen_sharing)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/call/CallControlsView.kt b/vector/src/main/java/im/vector/app/features/call/CallControlsView.kt
index b3fc36e5bc..f0158fc4d6 100644
--- a/vector/src/main/java/im/vector/app/features/call/CallControlsView.kt
+++ b/vector/src/main/java/im/vector/app/features/call/CallControlsView.kt
@@ -89,6 +89,8 @@ class CallControlsView @JvmOverloads constructor(
             views.videoToggleIcon.setImageResource(R.drawable.ic_video_off)
             views.videoToggleIcon.contentDescription = resources.getString(R.string.a11y_start_camera)
         }
+        views.videoToggleIcon.isEnabled = !state.isSharingScreen
+        views.videoToggleIcon.alpha = if (state.isSharingScreen) 0.5f else 1f
 
         when (callState) {
             is CallState.LocalRinging -> {
diff --git a/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
index e9d16ee710..a904658e9c 100644
--- a/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
@@ -24,6 +24,8 @@ import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP
 import android.content.res.Configuration
 import android.graphics.Color
+import android.media.projection.MediaProjection
+import android.media.projection.MediaProjectionManager
 import android.os.Build
 import android.os.Bundle
 import android.os.Parcelable
@@ -31,6 +33,7 @@ import android.util.Rational
 import android.view.MenuItem
 import android.view.View
 import android.view.WindowManager
+import androidx.activity.result.ActivityResult
 import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
 import androidx.core.content.getSystemService
@@ -56,6 +59,8 @@ import im.vector.app.features.call.dialpad.CallDialPadBottomSheet
 import im.vector.app.features.call.dialpad.DialPadFragment
 import im.vector.app.features.call.transfer.CallTransferActivity
 import im.vector.app.features.call.utils.EglUtils
+import im.vector.app.features.call.webrtc.ScreenCaptureService
+import im.vector.app.features.call.webrtc.ScreenCaptureServiceConnection
 import im.vector.app.features.call.webrtc.WebRtcCall
 import im.vector.app.features.call.webrtc.WebRtcCallManager
 import im.vector.app.features.displayname.getBestName
@@ -73,6 +78,7 @@ import org.matrix.android.sdk.api.session.call.TurnServerResponse
 import org.matrix.android.sdk.api.session.room.model.call.EndCallReason
 import org.webrtc.EglBase
 import org.webrtc.RendererCommon
+import org.webrtc.ScreenCapturerAndroid
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -94,6 +100,7 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
 
     @Inject lateinit var callManager: WebRtcCallManager
     @Inject lateinit var avatarRenderer: AvatarRenderer
+    @Inject lateinit var screenCaptureServiceConnection: ScreenCaptureServiceConnection
 
     private val callViewModel: VectorCallViewModel by viewModel()
 
@@ -157,6 +164,9 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
                 }
             }
         }
+
+        // Bind to service in case of user killed the app while there is an ongoing call
+        bindToScreenCaptureService()
     }
 
     override fun onNewIntent(intent: Intent?) {
@@ -512,20 +522,22 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
     private fun handleViewEvents(event: VectorCallViewEvents?) {
         Timber.tag(loggerTag.value).v("handleViewEvents $event")
         when (event) {
-            is VectorCallViewEvents.ConnectionTimeout      -> {
+            is VectorCallViewEvents.ConnectionTimeout                 -> {
                 onErrorTimoutConnect(event.turn)
             }
-            is VectorCallViewEvents.ShowDialPad            -> {
+            is VectorCallViewEvents.ShowDialPad                       -> {
                 CallDialPadBottomSheet.newInstance(false).apply {
                     callback = dialPadCallback
                 }.show(supportFragmentManager, FRAGMENT_DIAL_PAD_TAG)
             }
-            is VectorCallViewEvents.ShowCallTransferScreen -> {
+            is VectorCallViewEvents.ShowCallTransferScreen            -> {
                 val callId = withState(callViewModel) { it.callId }
                 navigator.openCallTransfer(this, callTransferActivityResultLauncher, callId)
             }
-            is VectorCallViewEvents.FailToTransfer         -> showSnackbar(getString(R.string.call_transfer_failure))
-            else                                           -> Unit
+            is VectorCallViewEvents.FailToTransfer                    -> showSnackbar(getString(R.string.call_transfer_failure))
+            is VectorCallViewEvents.ShowScreenSharingPermissionDialog -> handleShowScreenSharingPermissionDialog()
+            is VectorCallViewEvents.StopScreenSharingService          -> handleStopScreenSharingService()
+            else                                                      -> Unit
         }
     }
 
@@ -628,6 +640,54 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
         }
     }
 
+    private val screenSharingPermissionActivityResultLauncher = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                // We need to start a foreground service with a sticky notification during screen sharing
+                startScreenSharingService(activityResult)
+            } else {
+                startScreenSharing(activityResult)
+            }
+        }
+    }
+
+    private fun startScreenSharing(activityResult: ActivityResult) {
+        val videoCapturer = ScreenCapturerAndroid(activityResult.data, object : MediaProjection.Callback() {
+            override fun onStop() {
+                Timber.i("User revoked the screen capturing permission")
+            }
+        })
+        callViewModel.handle(VectorCallViewActions.StartScreenSharing(videoCapturer))
+    }
+
+    private fun startScreenSharingService(activityResult: ActivityResult) {
+        ContextCompat.startForegroundService(
+                this,
+                Intent(this, ScreenCaptureService::class.java)
+        )
+        bindToScreenCaptureService(activityResult)
+    }
+
+    private fun bindToScreenCaptureService(activityResult: ActivityResult? = null) {
+        screenCaptureServiceConnection.bind(object : ScreenCaptureServiceConnection.Callback {
+            override fun onServiceConnected() {
+                activityResult?.let { startScreenSharing(it) }
+            }
+        })
+    }
+
+    private fun handleShowScreenSharingPermissionDialog() {
+        getSystemService<MediaProjectionManager>()?.let {
+            navigator.openScreenSharingPermissionDialog(it.createScreenCaptureIntent(), screenSharingPermissionActivityResultLauncher)
+        }
+    }
+
+    private fun handleStopScreenSharingService() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            screenCaptureServiceConnection.stopScreenCapturing()
+        }
+    }
+
     companion object {
         private const val EXTRA_MODE = "EXTRA_MODE"
         private const val FRAGMENT_DIAL_PAD_TAG = "FRAGMENT_DIAL_PAD_TAG"
diff --git a/vector/src/main/java/im/vector/app/features/call/VectorCallViewActions.kt b/vector/src/main/java/im/vector/app/features/call/VectorCallViewActions.kt
index d1ed961814..cec118f296 100644
--- a/vector/src/main/java/im/vector/app/features/call/VectorCallViewActions.kt
+++ b/vector/src/main/java/im/vector/app/features/call/VectorCallViewActions.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.call
 import im.vector.app.core.platform.VectorViewModelAction
 import im.vector.app.features.call.audio.CallAudioManager
 import im.vector.app.features.call.transfer.CallTransferResult
+import org.webrtc.VideoCapturer
 
 sealed class VectorCallViewActions : VectorViewModelAction {
     object EndCall : VectorCallViewActions()
@@ -40,4 +41,6 @@ sealed class VectorCallViewActions : VectorViewModelAction {
     object CallTransferSelectionCancelled : VectorCallViewActions()
     data class CallTransferSelectionResult(val callTransferResult: CallTransferResult) : VectorCallViewActions()
     object TransferCall : VectorCallViewActions()
+    object ToggleScreenSharing : VectorCallViewActions()
+    data class StartScreenSharing(val videoCapturer: VideoCapturer) : VectorCallViewActions()
 }
diff --git a/vector/src/main/java/im/vector/app/features/call/VectorCallViewEvents.kt b/vector/src/main/java/im/vector/app/features/call/VectorCallViewEvents.kt
index 7c29d7eea3..52510f6f8b 100644
--- a/vector/src/main/java/im/vector/app/features/call/VectorCallViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/call/VectorCallViewEvents.kt
@@ -27,10 +27,10 @@ sealed class VectorCallViewEvents : VectorViewEvents {
             val available: Set<CallAudioManager.Device>,
             val current: CallAudioManager.Device
     ) : VectorCallViewEvents()
+
     object ShowDialPad : VectorCallViewEvents()
     object ShowCallTransferScreen : VectorCallViewEvents()
     object FailToTransfer : VectorCallViewEvents()
-//    data class CallAnswered(val content: CallAnswerContent) : VectorCallViewEvents()
-//    data class CallHangup(val content: CallHangupContent) : VectorCallViewEvents()
-//    object CallAccepted : VectorCallViewEvents()
+    object ShowScreenSharingPermissionDialog : VectorCallViewEvents()
+    object StopScreenSharingService : VectorCallViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt b/vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt
index b9bf578daa..e2cedbe1b0 100644
--- a/vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt
@@ -42,6 +42,7 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.call.CallState
 import org.matrix.android.sdk.api.session.call.MxCall
 import org.matrix.android.sdk.api.session.call.MxPeerConnectionState
+import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.room.model.call.supportCallTransfer
 import org.matrix.android.sdk.api.util.MatrixItem
 
@@ -144,9 +145,10 @@ class VectorCallViewModel @AssistedInject constructor(
         override fun onCallEnded(callId: String) {
             withState { state ->
                 if (state.otherKnownCallInfo?.callId == callId) {
-                    setState { copy(otherKnownCallInfo = null) }
+                    setState { copy(otherKnownCallInfo = null, isSharingScreen = false) }
                 }
             }
+            _viewEvents.post(VectorCallViewEvents.StopScreenSharingService)
         }
 
         override fun onCurrentCallChange(call: WebRtcCall?) {
@@ -155,9 +157,10 @@ class VectorCallViewModel @AssistedInject constructor(
             }
         }
 
-        override fun onAudioDevicesChange() {
-            val currentSoundDevice = callManager.audioManager.selectedDevice ?: return
-            if (currentSoundDevice == CallAudioManager.Device.Phone) {
+        override fun onAudioDevicesChange() = withState { state ->
+            val currentSoundDevice = callManager.audioManager.selectedDevice ?: return@withState
+            val webRtcCall = callManager.getCallById(state.callId)
+            if (webRtcCall != null && shouldActivateProximitySensor(webRtcCall)) {
                 proximityManager.start()
             } else {
                 proximityManager.stop()
@@ -204,7 +207,7 @@ class VectorCallViewModel @AssistedInject constructor(
             callManager.addListener(callManagerListener)
             webRtcCall.addListener(callListener)
             val currentSoundDevice = callManager.audioManager.selectedDevice
-            if (currentSoundDevice == CallAudioManager.Device.Phone) {
+            if (shouldActivateProximitySensor(webRtcCall)) {
                 proximityManager.start()
             }
             setState {
@@ -223,13 +226,18 @@ class VectorCallViewModel @AssistedInject constructor(
                         formattedDuration = webRtcCall.formattedDuration(),
                         isHD = webRtcCall.mxCall.isVideoCall && webRtcCall.currentCaptureFormat() is CaptureFormat.HD,
                         canOpponentBeTransferred = webRtcCall.mxCall.capabilities.supportCallTransfer(),
-                        transferee = computeTransfereeState(webRtcCall.mxCall)
+                        transferee = computeTransfereeState(webRtcCall.mxCall),
+                        isSharingScreen = webRtcCall.isSharingScreen()
                 )
             }
             updateOtherKnownCall(webRtcCall)
         }
     }
 
+    private fun shouldActivateProximitySensor(webRtcCall: WebRtcCall): Boolean {
+        return callManager.audioManager.selectedDevice == CallAudioManager.Device.Phone && !webRtcCall.isSharingScreen()
+    }
+
     private fun WebRtcCall.extractCallInfo(): VectorCallViewState.CallInfo {
         val assertedIdentity = this.remoteAssertedIdentity
         val matrixItem = if (assertedIdentity != null) {
@@ -256,27 +264,30 @@ class VectorCallViewModel @AssistedInject constructor(
 
     override fun handle(action: VectorCallViewActions) = withState { state ->
         when (action) {
-            VectorCallViewActions.EndCall              -> call?.endCall()
-            VectorCallViewActions.AcceptCall           -> {
+            VectorCallViewActions.EndCall                        -> {
+                call?.endCall()
+                _viewEvents.post(VectorCallViewEvents.StopScreenSharingService)
+            }
+            VectorCallViewActions.AcceptCall                     -> {
                 setState {
                     copy(callState = Loading())
                 }
                 call?.acceptIncomingCall()
             }
-            VectorCallViewActions.DeclineCall          -> {
+            VectorCallViewActions.DeclineCall                    -> {
                 setState {
                     copy(callState = Loading())
                 }
                 call?.endCall()
             }
-            VectorCallViewActions.ToggleMute           -> {
+            VectorCallViewActions.ToggleMute                     -> {
                 val muted = state.isAudioMuted
                 call?.muteCall(!muted)
                 setState {
                     copy(isAudioMuted = !muted)
                 }
             }
-            VectorCallViewActions.ToggleVideo          -> {
+            VectorCallViewActions.ToggleVideo                    -> {
                 if (state.isVideoCall) {
                     val videoEnabled = state.isVideoEnabled
                     call?.enableVideo(!videoEnabled)
@@ -286,19 +297,19 @@ class VectorCallViewModel @AssistedInject constructor(
                 }
                 Unit
             }
-            VectorCallViewActions.ToggleHoldResume     -> {
+            VectorCallViewActions.ToggleHoldResume               -> {
                 val isRemoteOnHold = state.isRemoteOnHold
                 call?.updateRemoteOnHold(!isRemoteOnHold)
             }
-            is VectorCallViewActions.ChangeAudioDevice -> {
+            is VectorCallViewActions.ChangeAudioDevice           -> {
                 callManager.audioManager.setAudioDevice(action.device)
             }
-            VectorCallViewActions.SwitchSoundDevice    -> {
+            VectorCallViewActions.SwitchSoundDevice              -> {
                 _viewEvents.post(
                         VectorCallViewEvents.ShowSoundDeviceChooser(state.availableDevices, state.device)
                 )
             }
-            VectorCallViewActions.HeadSetButtonPressed -> {
+            VectorCallViewActions.HeadSetButtonPressed           -> {
                 if (state.callState.invoke() is CallState.LocalRinging) {
                     // accept call
                     call?.acceptIncomingCall()
@@ -309,20 +320,20 @@ class VectorCallViewModel @AssistedInject constructor(
                 }
                 Unit
             }
-            VectorCallViewActions.ToggleCamera         -> {
+            VectorCallViewActions.ToggleCamera                   -> {
                 call?.switchCamera()
             }
-            VectorCallViewActions.ToggleHDSD           -> {
+            VectorCallViewActions.ToggleHDSD                     -> {
                 if (!state.isVideoCall) return@withState
                 call?.setCaptureFormat(if (state.isHD) CaptureFormat.SD else CaptureFormat.HD)
             }
-            VectorCallViewActions.OpenDialPad          -> {
+            VectorCallViewActions.OpenDialPad                    -> {
                 _viewEvents.post(VectorCallViewEvents.ShowDialPad)
             }
-            is VectorCallViewActions.SendDtmfDigit     -> {
+            is VectorCallViewActions.SendDtmfDigit               -> {
                 call?.sendDtmfDigit(action.digit)
             }
-            VectorCallViewActions.InitiateCallTransfer -> {
+            VectorCallViewActions.InitiateCallTransfer           -> {
                 call?.updateRemoteOnHold(true)
                 _viewEvents.post(
                         VectorCallViewEvents.ShowCallTransferScreen
@@ -334,13 +345,42 @@ class VectorCallViewModel @AssistedInject constructor(
             is VectorCallViewActions.CallTransferSelectionResult -> {
                 handleCallTransferSelectionResult(action.callTransferResult)
             }
-            VectorCallViewActions.TransferCall         -> {
+            VectorCallViewActions.TransferCall                   -> {
                 handleCallTransfer()
             }
-            is VectorCallViewActions.SwitchCall        -> {
+            is VectorCallViewActions.SwitchCall                  -> {
                 setState { VectorCallViewState(action.callArgs) }
                 setupCallWithCurrentState()
             }
+            is VectorCallViewActions.ToggleScreenSharing         -> {
+                handleToggleScreenSharing(state.isSharingScreen)
+            }
+            is VectorCallViewActions.StartScreenSharing          -> {
+                call?.startSharingScreen(action.videoCapturer)
+                proximityManager.stop()
+                setState {
+                    copy(isSharingScreen = true)
+                }
+            }
+        }
+    }
+
+    private fun handleToggleScreenSharing(isSharingScreen: Boolean) {
+        if (isSharingScreen) {
+            call?.stopSharingScreen()
+            setState {
+                copy(isSharingScreen = false)
+            }
+            _viewEvents.post(
+                    VectorCallViewEvents.StopScreenSharingService
+            )
+            if (callManager.audioManager.selectedDevice == CallAudioManager.Device.Phone) {
+                proximityManager.start()
+            }
+        } else {
+            _viewEvents.post(
+                    VectorCallViewEvents.ShowScreenSharingPermissionDialog
+            )
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/call/VectorCallViewState.kt b/vector/src/main/java/im/vector/app/features/call/VectorCallViewState.kt
index 2d33cbf9b9..2cd819b5f5 100644
--- a/vector/src/main/java/im/vector/app/features/call/VectorCallViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/call/VectorCallViewState.kt
@@ -42,7 +42,8 @@ data class VectorCallViewState(
         val callInfo: CallInfo? = null,
         val formattedDuration: String = "",
         val canOpponentBeTransferred: Boolean = false,
-        val transferee: TransfereeState = TransfereeState.NoTransferee
+        val transferee: TransfereeState = TransfereeState.NoTransferee,
+        val isSharingScreen: Boolean = false
 ) : MavericksState {
 
     sealed class TransfereeState {
diff --git a/vector/src/main/java/im/vector/app/features/call/audio/API23AudioDeviceDetector.kt b/vector/src/main/java/im/vector/app/features/call/audio/API23AudioDeviceDetector.kt
index 7e12987a6b..ccf79cc02d 100644
--- a/vector/src/main/java/im/vector/app/features/call/audio/API23AudioDeviceDetector.kt
+++ b/vector/src/main/java/im/vector/app/features/call/audio/API23AudioDeviceDetector.kt
@@ -32,10 +32,11 @@ internal class API23AudioDeviceDetector(private val audioManager: AudioManager,
         val deviceInfos = audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)
         for (info in deviceInfos) {
             when (info.type) {
-                AudioDeviceInfo.TYPE_BLUETOOTH_SCO -> devices.add(CallAudioManager.Device.WirelessHeadset(info.productName.toString()))
-                AudioDeviceInfo.TYPE_BUILTIN_EARPIECE -> devices.add(CallAudioManager.Device.Phone)
-                AudioDeviceInfo.TYPE_BUILTIN_SPEAKER -> devices.add(CallAudioManager.Device.Speaker)
-                AudioDeviceInfo.TYPE_WIRED_HEADPHONES, AudioDeviceInfo.TYPE_WIRED_HEADSET, TYPE_USB_HEADSET -> devices.add(CallAudioManager.Device.Headset)
+                AudioDeviceInfo.TYPE_BLUETOOTH_SCO                   -> devices.add(CallAudioManager.Device.WirelessHeadset(info.productName.toString()))
+                AudioDeviceInfo.TYPE_BUILTIN_EARPIECE                -> devices.add(CallAudioManager.Device.Phone)
+                AudioDeviceInfo.TYPE_BUILTIN_SPEAKER                 -> devices.add(CallAudioManager.Device.Speaker)
+                AudioDeviceInfo.TYPE_WIRED_HEADPHONES,
+                AudioDeviceInfo.TYPE_WIRED_HEADSET, TYPE_USB_HEADSET -> devices.add(CallAudioManager.Device.Headset)
             }
         }
         callAudioManager.replaceDevices(devices)
diff --git a/vector/src/main/java/im/vector/app/features/call/audio/DefaultAudioDeviceRouter.kt b/vector/src/main/java/im/vector/app/features/call/audio/DefaultAudioDeviceRouter.kt
index fd85ce075f..c3500c7bc2 100644
--- a/vector/src/main/java/im/vector/app/features/call/audio/DefaultAudioDeviceRouter.kt
+++ b/vector/src/main/java/im/vector/app/features/call/audio/DefaultAudioDeviceRouter.kt
@@ -95,7 +95,7 @@ class DefaultAudioDeviceRouter(private val audioManager: AudioManager,
     override fun onAudioFocusChange(focusChange: Int) {
         callAudioManager.runInAudioThread {
             when (focusChange) {
-                AudioManager.AUDIOFOCUS_GAIN -> {
+                AudioManager.AUDIOFOCUS_GAIN                                                                                          -> {
                     Timber.d(" Audio focus gained")
                     if (audioFocusLost) {
                         callAudioManager.resetAudioRoute()
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiService.kt b/vector/src/main/java/im/vector/app/features/call/conference/JitsiService.kt
index 6fa65bdb7f..b0da4f0e18 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/JitsiService.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/JitsiService.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.call.conference
 import im.vector.app.R
 import im.vector.app.core.network.await
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.time.Clock
 import im.vector.app.core.utils.ensureProtocol
 import im.vector.app.core.utils.toBase32String
 import im.vector.app.features.call.conference.jwt.JitsiJWTFactory
@@ -31,6 +32,7 @@ import org.jitsi.meet.sdk.JitsiMeetUserInfo
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.widgets.model.Widget
 import org.matrix.android.sdk.api.session.widgets.model.WidgetType
 import org.matrix.android.sdk.api.util.MatrixJsonParser
@@ -45,7 +47,9 @@ class JitsiService @Inject constructor(
         private val rawService: RawService,
         private val stringProvider: StringProvider,
         private val themeProvider: ThemeProvider,
-        private val jitsiJWTFactory: JitsiJWTFactory) {
+        private val jitsiJWTFactory: JitsiJWTFactory,
+        private val clock: Clock,
+) {
 
     companion object {
         const val JITSI_OPEN_ID_TOKEN_JWT_AUTH = "openidtoken-jwt"
@@ -59,7 +63,7 @@ class JitsiService @Inject constructor(
 
     suspend fun createJitsiWidget(roomId: String, withVideo: Boolean): Widget {
         // Build data for a jitsi widget
-        val widgetId: String = WidgetType.Jitsi.preferred + "_" + session.myUserId + "_" + System.currentTimeMillis()
+        val widgetId: String = WidgetType.Jitsi.preferred + "_" + session.myUserId + "_" + clock.epochMillis()
         val preferredJitsiDomain = tryOrNull {
             rawService.getElementWellknown(session.sessionParams)
                     ?.jitsiServer
@@ -99,7 +103,7 @@ class JitsiService @Inject constructor(
     }
 
     suspend fun joinConference(roomId: String, jitsiWidget: Widget, enableVideo: Boolean): JitsiCallViewEvents.JoinConference {
-        val me = session.getRoomMember(session.myUserId, roomId)?.toMatrixItem()
+        val me = session.roomService().getRoomMember(session.myUserId, roomId)?.toMatrixItem()
         val userDisplayName = me?.getBestName()
         val userAvatar = me?.avatarUrl?.let { session.contentUrlResolver().resolveFullSize(it) }
         val userInfo = JitsiMeetUserInfo().apply {
diff --git a/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadLookup.kt b/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadLookup.kt
index eadccab4f6..e835a74fd6 100644
--- a/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadLookup.kt
+++ b/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadLookup.kt
@@ -47,9 +47,9 @@ class DialPadLookup @Inject constructor(
             if (nativeUserId == session.myUserId) {
                 throw Failure.NumberIsYours
             }
-            session.getExistingDirectRoomWithUser(nativeUserId)
+            session.roomService().getExistingDirectRoomWithUser(nativeUserId)
             // if there is not, just create a DM with the sip user
-            ?: directRoomHelper.ensureDMExists(sipUserId)
+                    ?: directRoomHelper.ensureDMExists(sipUserId)
         } else {
             // do the same if there is no corresponding native user.
             directRoomHelper.ensureDMExists(sipUserId)
diff --git a/vector/src/main/java/im/vector/app/features/call/lookup/CallUserMapper.kt b/vector/src/main/java/im/vector/app/features/call/lookup/CallUserMapper.kt
index 0820b34124..eb04ab63d7 100644
--- a/vector/src/main/java/im/vector/app/features/call/lookup/CallUserMapper.kt
+++ b/vector/src/main/java/im/vector/app/features/call/lookup/CallUserMapper.kt
@@ -20,6 +20,7 @@ import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.accountdata.RoomAccountDataTypes
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
@@ -29,7 +30,7 @@ class CallUserMapper(private val session: Session, private val protocolsChecker:
     fun nativeRoomForVirtualRoom(roomId: String): String? {
         if (!protocolsChecker.supportVirtualRooms) return null
         val virtualRoom = session.getRoom(roomId) ?: return null
-        val virtualRoomEvent = virtualRoom.getAccountDataEvent(RoomAccountDataTypes.EVENT_TYPE_VIRTUAL_ROOM)
+        val virtualRoomEvent = virtualRoom.roomAccountDataService().getAccountDataEvent(RoomAccountDataTypes.EVENT_TYPE_VIRTUAL_ROOM)
         return virtualRoomEvent?.content?.toModel<RoomVirtualContent>()?.nativeRoomId
     }
 
@@ -61,7 +62,7 @@ class CallUserMapper(private val session: Session, private val protocolsChecker:
         val nativeLookup = session.sipNativeLookup(inviterId).firstOrNull() ?: return
         if (nativeLookup.fields.containsKey("is_virtual")) {
             val nativeUser = nativeLookup.userId
-            val nativeRoomId = session.getExistingDirectRoomWithUser(nativeUser)
+            val nativeRoomId = session.roomService().getExistingDirectRoomWithUser(nativeUser)
             if (nativeRoomId != null) {
                 // It's a virtual room with a matching native room, so set the room account data. This
                 // will make sure we know where how to map calls and also allow us know not to display
@@ -78,11 +79,11 @@ class CallUserMapper(private val session: Session, private val protocolsChecker:
 
     private suspend fun Room.markVirtual(nativeRoomId: String) {
         val virtualRoomContent = RoomVirtualContent(nativeRoomId = nativeRoomId)
-        updateAccountData(RoomAccountDataTypes.EVENT_TYPE_VIRTUAL_ROOM, virtualRoomContent.toContent())
+        roomAccountDataService().updateAccountData(RoomAccountDataTypes.EVENT_TYPE_VIRTUAL_ROOM, virtualRoomContent.toContent())
     }
 
     private suspend fun ensureVirtualRoomExists(userId: String, nativeRoomId: String): String {
-        val existingDMRoom = tryOrNull { session.getExistingDirectRoomWithUser(userId) }
+        val existingDMRoom = tryOrNull { session.roomService().getExistingDirectRoomWithUser(userId) }
         val roomId: String
         if (existingDMRoom != null) {
             roomId = existingDMRoom
@@ -92,7 +93,7 @@ class CallUserMapper(private val session: Session, private val protocolsChecker:
                 setDirectMessage()
                 creationContent[RoomAccountDataTypes.EVENT_TYPE_VIRTUAL_ROOM] = nativeRoomId
             }
-            roomId = session.createRoom(roomParams)
+            roomId = session.roomService().createRoom(roomParams)
         }
         return roomId
     }
diff --git a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewModel.kt b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewModel.kt
index 1765b58a02..67f0949dcf 100644
--- a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferViewModel.kt
@@ -31,7 +31,7 @@ import org.matrix.android.sdk.api.session.call.MxCall
 
 class CallTransferViewModel @AssistedInject constructor(@Assisted initialState: CallTransferViewState,
                                                         private val callManager: WebRtcCallManager) :
-    VectorViewModel<CallTransferViewState, EmptyAction, CallTransferViewEvents>(initialState) {
+        VectorViewModel<CallTransferViewState, EmptyAction, CallTransferViewEvents>(initialState) {
 
     @AssistedFactory
     interface Factory : MavericksAssistedViewModelFactory<CallTransferViewModel, CallTransferViewState> {
@@ -62,5 +62,5 @@ class CallTransferViewModel @AssistedInject constructor(@Assisted initialState:
         call?.removeListener(callListener)
     }
 
-    override fun handle(action: EmptyAction) { }
+    override fun handle(action: EmptyAction) {}
 }
diff --git a/vector/src/main/java/im/vector/app/features/call/webrtc/PeerConnectionObserver.kt b/vector/src/main/java/im/vector/app/features/call/webrtc/PeerConnectionObserver.kt
index 99c26c5ebe..c776951f93 100644
--- a/vector/src/main/java/im/vector/app/features/call/webrtc/PeerConnectionObserver.kt
+++ b/vector/src/main/java/im/vector/app/features/call/webrtc/PeerConnectionObserver.kt
@@ -37,13 +37,13 @@ class PeerConnectionObserver(private val webRtcCall: WebRtcCall) : PeerConnectio
              * Every ICE transport used by the connection is either in use (state "connected" or "completed")
              * or is closed (state "closed"); in addition, at least one transport is either "connected" or "completed"
              */
-            PeerConnection.PeerConnectionState.CONNECTED -> {
+            PeerConnection.PeerConnectionState.CONNECTED    -> {
                 webRtcCall.mxCall.state = CallState.Connected(MxPeerConnectionState.CONNECTED)
             }
             /**
              * One or more of the ICE transports on the connection is in the "failed" state.
              */
-            PeerConnection.PeerConnectionState.FAILED -> {
+            PeerConnection.PeerConnectionState.FAILED       -> {
                 // This can be temporary, e.g when other ice not yet received...
                 // webRtcCall.mxCall.state = CallState.ERROR
                 webRtcCall.mxCall.state = CallState.Connected(MxPeerConnectionState.FAILED)
@@ -58,7 +58,7 @@ class PeerConnectionObserver(private val webRtcCall: WebRtcCall) : PeerConnectio
                  * One or more of the ICE transports are currently in the process of establishing a connection;
                  * that is, their RTCIceConnectionState is either "checking" or "connected", and no transports are in the "failed" state
                  */
-            PeerConnection.PeerConnectionState.CONNECTING -> {
+            PeerConnection.PeerConnectionState.CONNECTING   -> {
                 webRtcCall.mxCall.state = CallState.Connected(MxPeerConnectionState.CONNECTING)
             }
             /**
@@ -66,7 +66,7 @@ class PeerConnectionObserver(private val webRtcCall: WebRtcCall) : PeerConnectio
              * This value was in the RTCSignalingState enum (and therefore found by reading the value of the signalingState)
              * property until the May 13, 2016 draft of the specification.
              */
-            PeerConnection.PeerConnectionState.CLOSED -> {
+            PeerConnection.PeerConnectionState.CLOSED       -> {
                 webRtcCall.mxCall.state = CallState.Connected(MxPeerConnectionState.CLOSED)
             }
             /**
@@ -76,7 +76,7 @@ class PeerConnectionObserver(private val webRtcCall: WebRtcCall) : PeerConnectio
             PeerConnection.PeerConnectionState.DISCONNECTED -> {
                 webRtcCall.mxCall.state = CallState.Connected(MxPeerConnectionState.DISCONNECTED)
             }
-            null -> {
+            null                                            -> {
             }
         }
     }
@@ -101,14 +101,14 @@ class PeerConnectionObserver(private val webRtcCall: WebRtcCall) : PeerConnectio
              * the ICE agent is gathering addresses or is waiting to be given remote candidates through
              * calls to RTCPeerConnection.addIceCandidate() (or both).
              */
-            PeerConnection.IceConnectionState.NEW -> {
+            PeerConnection.IceConnectionState.NEW          -> {
             }
             /**
              * The ICE agent has been given one or more remote candidates and is checking pairs of local and remote candidates
              * against one another to try to find a compatible match, but has not yet found a pair which will allow
              * the peer connection to be made. It's possible that gathering of candidates is also still underway.
              */
-            PeerConnection.IceConnectionState.CHECKING -> {
+            PeerConnection.IceConnectionState.CHECKING     -> {
             }
 
             /**
@@ -117,7 +117,7 @@ class PeerConnectionObserver(private val webRtcCall: WebRtcCall) : PeerConnectio
              * It's possible that gathering is still underway, and it's also possible that the ICE agent is still checking
              * candidates against one another looking for a better connection to use.
              */
-            PeerConnection.IceConnectionState.CONNECTED -> {
+            PeerConnection.IceConnectionState.CONNECTED    -> {
             }
             /**
              * Checks to ensure that components are still connected failed for at least one component of the RTCPeerConnection.
@@ -131,18 +131,18 @@ class PeerConnectionObserver(private val webRtcCall: WebRtcCall) : PeerConnectio
              * compatible matches for all components of the connection.
              * It is, however, possible that the ICE agent did find compatible connections for some components.
              */
-            PeerConnection.IceConnectionState.FAILED -> {
+            PeerConnection.IceConnectionState.FAILED       -> {
                 webRtcCall.onRenegotiationNeeded(restartIce = true)
             }
             /**
              *  The ICE agent has finished gathering candidates, has checked all pairs against one another, and has found a connection for all components.
              */
-            PeerConnection.IceConnectionState.COMPLETED -> {
+            PeerConnection.IceConnectionState.COMPLETED    -> {
             }
             /**
              * The ICE agent for this RTCPeerConnection has shut down and is no longer handling requests.
              */
-            PeerConnection.IceConnectionState.CLOSED -> {
+            PeerConnection.IceConnectionState.CLOSED       -> {
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/call/webrtc/ScreenCaptureService.kt b/vector/src/main/java/im/vector/app/features/call/webrtc/ScreenCaptureService.kt
new file mode 100644
index 0000000000..489b2d1eae
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/call/webrtc/ScreenCaptureService.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.call.webrtc
+
+import android.content.Intent
+import android.os.Binder
+import android.os.IBinder
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.services.VectorService
+import im.vector.app.core.time.Clock
+import im.vector.app.features.notifications.NotificationUtils
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class ScreenCaptureService : VectorService() {
+
+    @Inject lateinit var notificationUtils: NotificationUtils
+    @Inject lateinit var clock: Clock
+    private val binder = LocalBinder()
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        showStickyNotification()
+
+        return START_STICKY
+    }
+
+    private fun showStickyNotification() {
+        val notificationId = clock.epochMillis().toInt()
+        val notification = notificationUtils.buildScreenSharingNotification()
+        startForeground(notificationId, notification)
+    }
+
+    override fun onBind(intent: Intent?): IBinder {
+        return binder
+    }
+
+    fun stopService() {
+        stopSelf()
+    }
+
+    inner class LocalBinder : Binder() {
+        fun getService(): ScreenCaptureService = this@ScreenCaptureService
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/call/webrtc/ScreenCaptureServiceConnection.kt b/vector/src/main/java/im/vector/app/features/call/webrtc/ScreenCaptureServiceConnection.kt
new file mode 100644
index 0000000000..aa7c7f450a
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/call/webrtc/ScreenCaptureServiceConnection.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.call.webrtc
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
+import android.os.IBinder
+import javax.inject.Inject
+
+class ScreenCaptureServiceConnection @Inject constructor(
+        private val context: Context
+) : ServiceConnection {
+
+    interface Callback {
+        fun onServiceConnected()
+    }
+
+    private var isBound = false
+    private var screenCaptureService: ScreenCaptureService? = null
+    private var callback: Callback? = null
+
+    fun bind(callback: Callback) {
+        this.callback = callback
+
+        if (isBound) {
+            callback.onServiceConnected()
+        } else {
+            Intent(context, ScreenCaptureService::class.java).also { intent ->
+                context.bindService(intent, this, 0)
+            }
+        }
+    }
+
+    fun stopScreenCapturing() {
+        screenCaptureService?.stopService()
+    }
+
+    override fun onServiceConnected(className: ComponentName, binder: IBinder) {
+        screenCaptureService = (binder as ScreenCaptureService.LocalBinder).getService()
+        isBound = true
+        callback?.onServiceConnected()
+    }
+
+    override fun onServiceDisconnected(className: ComponentName) {
+        isBound = false
+        screenCaptureService = null
+        callback = null
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
index 90088c8475..5a100edcf2 100644
--- a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
+++ b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
@@ -80,10 +80,12 @@ import org.webrtc.MediaConstraints
 import org.webrtc.MediaStream
 import org.webrtc.PeerConnection
 import org.webrtc.PeerConnectionFactory
+import org.webrtc.RtpSender
 import org.webrtc.RtpTransceiver
 import org.webrtc.SessionDescription
 import org.webrtc.SurfaceTextureHelper
 import org.webrtc.SurfaceViewRenderer
+import org.webrtc.VideoCapturer
 import org.webrtc.VideoSource
 import org.webrtc.VideoTrack
 import timber.log.Timber
@@ -95,6 +97,7 @@ import kotlin.coroutines.CoroutineContext
 private const val STREAM_ID = "userMedia"
 private const val AUDIO_TRACK_ID = "${STREAM_ID}a0"
 private const val VIDEO_TRACK_ID = "${STREAM_ID}v0"
+private const val SCREEN_TRACK_ID = "${STREAM_ID}s0"
 private val DEFAULT_AUDIO_CONSTRAINTS = MediaConstraints()
 private const val INVITE_TIMEOUT_IN_MS = 60_000L
 
@@ -153,13 +156,16 @@ class WebRtcCall(
     private var makingOffer: Boolean = false
     private var ignoreOffer: Boolean = false
 
-    private var videoCapturer: CameraVideoCapturer? = null
+    private var videoCapturer: VideoCapturer? = null
 
     private val availableCamera = ArrayList<CameraProxy>()
     private var cameraInUse: CameraProxy? = null
     private var currentCaptureFormat: CaptureFormat = CaptureFormat.HD
     private var cameraAvailabilityCallback: CameraManager.AvailabilityCallback? = null
 
+    private var videoSender: RtpSender? = null
+    private var screenSender: RtpSender? = null
+
     private val timer = CountUpTimer(1000L).apply {
         tickListener = object : CountUpTimer.TickListener {
             override fun onTick(milliseconds: Long) {
@@ -617,7 +623,7 @@ class WebRtcCall(
             val videoTrack = peerConnectionFactory.createVideoTrack(VIDEO_TRACK_ID, videoSource)
             Timber.tag(loggerTag.value).v("Add video track $VIDEO_TRACK_ID to call ${mxCall.callId}")
             videoTrack.setEnabled(true)
-            peerConnection?.addTrack(videoTrack, listOf(STREAM_ID))
+            videoSender = peerConnection?.addTrack(videoTrack, listOf(STREAM_ID))
             localVideoSource = videoSource
             localVideoTrack = videoTrack
         }
@@ -670,15 +676,11 @@ class WebRtcCall(
                 isRemoteOnHold = true
                 isLocalOnHold = true
                 direction = RtpTransceiver.RtpTransceiverDirection.SEND_ONLY
-                timer.pause()
             } else {
                 isRemoteOnHold = false
                 isLocalOnHold = wasLocalOnHold
                 onCallBecomeActive(this@WebRtcCall)
                 direction = RtpTransceiver.RtpTransceiverDirection.SEND_RECV
-                if (!isLocalOnHold) {
-                    timer.resume()
-                }
             }
             for (transceiver in peerConnection?.transceivers ?: emptyList()) {
                 transceiver.direction = direction
@@ -722,7 +724,7 @@ class WebRtcCall(
             Timber.tag(loggerTag.value).v("switchCamera")
             if (mxCall.state is CallState.Connected && mxCall.isVideoCall) {
                 val oppositeCamera = getOppositeCameraIfAny() ?: return@launch
-                videoCapturer?.switchCamera(
+                (videoCapturer as? CameraVideoCapturer)?.switchCamera(
                         object : CameraVideoCapturer.CameraSwitchHandler {
                             // Invoked on success. |isFrontCamera| is true if the new camera is front facing.
                             override fun onCameraSwitchDone(isFrontCamera: Boolean) {
@@ -770,6 +772,62 @@ class WebRtcCall(
         return currentCaptureFormat
     }
 
+    fun startSharingScreen(videoCapturer: VideoCapturer) {
+        val factory = peerConnectionFactoryProvider.get() ?: return
+
+        this.videoCapturer = videoCapturer
+
+        val localMediaStream = factory.createLocalMediaStream(STREAM_ID)
+        val videoSource = factory.createVideoSource(videoCapturer.isScreencast)
+
+        startCapturingScreen(videoCapturer, videoSource)
+
+        removeLocalSurfaceRenderers()
+
+        showScreenLocally(factory, videoSource, localMediaStream)
+
+        videoSender?.let { removeStream(it) }
+
+        screenSender = peerConnection?.addTrack(localVideoTrack, listOf(STREAM_ID))
+    }
+
+    fun stopSharingScreen() {
+        localVideoTrack?.setEnabled(false)
+        screenSender?.let { removeStream(it) }
+        if (mxCall.isVideoCall) {
+            peerConnectionFactoryProvider.get()?.let { configureVideoTrack(it) }
+        }
+        updateMuteStatus()
+        sessionScope?.launch(dispatcher) { attachViewRenderersInternal() }
+    }
+
+    private fun removeStream(sender: RtpSender) {
+        peerConnection?.removeTrack(sender)
+    }
+
+    private fun showScreenLocally(factory: PeerConnectionFactory, videoSource: VideoSource?, localMediaStream: MediaStream?) {
+        localVideoTrack = factory.createVideoTrack(SCREEN_TRACK_ID, videoSource).apply { setEnabled(true) }
+        localMediaStream?.addTrack(localVideoTrack)
+        localSurfaceRenderers.forEach { it.get()?.let { localVideoTrack?.addSink(it) } }
+    }
+
+    private fun removeLocalSurfaceRenderers() {
+        localSurfaceRenderers.forEach { it.get()?.let { localVideoTrack?.removeSink(it) } }
+    }
+
+    private fun startCapturingScreen(videoCapturer: VideoCapturer, videoSource: VideoSource) {
+        val surfaceTextureHelper = SurfaceTextureHelper.create("CaptureThread", rootEglBase!!.eglBaseContext)
+        videoCapturer.initialize(surfaceTextureHelper, context, videoSource.capturerObserver)
+        videoCapturer.startCapture(currentCaptureFormat.width, currentCaptureFormat.height, currentCaptureFormat.fps)
+    }
+
+    /**
+     * Returns true if the user is sharing the screen, false otherwise.
+     */
+    fun isSharingScreen(): Boolean {
+        return localVideoTrack?.enabled().orFalse() && localVideoTrack?.id() == SCREEN_TRACK_ID
+    }
+
     private suspend fun release() {
         listeners.clear()
         mxCall.removeListener(this)
@@ -933,11 +991,6 @@ class WebRtcCall(
             wasLocalOnHold = nowOnHold
             if (prevOnHold != nowOnHold) {
                 isLocalOnHold = nowOnHold
-                if (nowOnHold) {
-                    timer.pause()
-                } else {
-                    timer.resume()
-                }
                 listeners.forEach {
                     tryOrNull { it.onHoldUnhold() }
                 }
@@ -981,7 +1034,7 @@ class WebRtcCall(
                 val nativeUserId = session.sipNativeLookup(newAssertedIdentity.id!!).firstOrNull()?.userId
                 if (nativeUserId != null) {
                     val resolvedUser = tryOrNull {
-                        session.resolveUser(nativeUserId)
+                        session.userService().resolveUser(nativeUserId)
                     }
                     if (resolvedUser != null) {
                         remoteAssertedIdentity = newAssertedIdentity.copy(
diff --git a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallExt.kt b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallExt.kt
index ac9d169633..de6d5acb20 100644
--- a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallExt.kt
+++ b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallExt.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.call.webrtc
 
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
 
@@ -29,7 +30,7 @@ fun WebRtcCall.getOpponentAsMatrixItem(session: Session): MatrixItem? {
             roomSummary.toMatrixItem()
         } else {
             val userId = roomSummary.otherMemberIds.first()
-            return room.getRoomMember(userId)?.toMatrixItem()
+            return room.membershipService().getRoomMember(userId)?.toMatrixItem()
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
index fe12bf1ec7..10e822c947 100644
--- a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
+++ b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
@@ -215,9 +215,10 @@ class WebRtcCallManager @Inject constructor(
         }
 
         Timber.tag(loggerTag.value).v("PeerConnectionFactory.initialize")
-        PeerConnectionFactory.initialize(PeerConnectionFactory
-                .InitializationOptions.builder(context.applicationContext)
-                .createInitializationOptions()
+        PeerConnectionFactory.initialize(
+                PeerConnectionFactory
+                        .InitializationOptions.builder(context.applicationContext)
+                        .createInitializationOptions()
         )
 
         val options = PeerConnectionFactory.Options()
@@ -226,7 +227,8 @@ class WebRtcCallManager @Inject constructor(
                 /* enableIntelVp8Encoder */
                 true,
                 /* enableH264HighProfile */
-                true)
+                true
+        )
         val defaultVideoDecoderFactory = DefaultVideoDecoderFactory(eglBaseContext)
         Timber.tag(loggerTag.value).v("PeerConnectionFactory.createPeerConnectionFactory ...")
         peerConnectionFactory = PeerConnectionFactory.builder()
@@ -304,7 +306,8 @@ class WebRtcCallManager @Inject constructor(
         }
         CallService.onOutgoingCallRinging(
                 context = context.applicationContext,
-                callId = mxCall.callId)
+                callId = mxCall.callId
+        )
 
         // start the activity now
         context.startActivity(VectorCallActivity.newIntent(context, webRtcCall, VectorCallActivity.OUTGOING_CREATED))
diff --git a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt
index 0053ab0fc6..25fee28123 100644
--- a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt
@@ -43,6 +43,7 @@ import im.vector.app.core.utils.checkPermissions
 import im.vector.app.core.utils.onPermissionDeniedSnackbar
 import im.vector.app.core.utils.registerForPermissionsResult
 import im.vector.app.features.analytics.plan.MobileScreen
+import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.contactsbook.ContactsBookFragment
 import im.vector.app.features.qrcode.QrCodeScannerEvents
 import im.vector.app.features.qrcode.QrCodeScannerFragment
@@ -206,7 +207,11 @@ class CreateDirectRoomActivity : SimpleFragmentActivity() {
     }
 
     private fun renderCreationSuccess(roomId: String) {
-        navigator.openRoom(this, roomId)
+        navigator.openRoom(
+                context = this,
+                roomId = roomId,
+                trigger = ViewRoom.Trigger.MessageUser
+        )
         finish()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt
index 0d67390654..a507f0d099 100644
--- a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt
@@ -36,6 +36,7 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getUser
 import org.matrix.android.sdk.api.session.permalinks.PermalinkData
 import org.matrix.android.sdk.api.session.permalinks.PermalinkParser
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
@@ -74,7 +75,11 @@ class CreateDirectRoomViewModel @AssistedInject constructor(
                 _viewEvents.post(CreateDirectRoomViewEvents.DmSelf)
             } else {
                 // Try to get user from known users and fall back to creating a User object from MXID
-                val qrInvitee = if (session.getUser(mxid) != null) session.getUser(mxid)!! else User(mxid, null, null)
+                val qrInvitee = if (session.getUser(mxid) != null) {
+                    session.getUser(mxid)!!
+                } else {
+                    User(mxid, null, null)
+                }
                 onSubmitInvitees(setOf(PendingSelection.UserPendingSelection(qrInvitee)))
             }
         }
@@ -85,7 +90,7 @@ class CreateDirectRoomViewModel @AssistedInject constructor(
      */
     private fun onSubmitInvitees(selections: Set<PendingSelection>) {
         val existingRoomId = selections.singleOrNull()?.getMxId()?.let { userId ->
-            session.getExistingDirectRoomWithUser(userId)
+            session.roomService().getExistingDirectRoomWithUser(userId)
         }
         if (existingRoomId != null) {
             // Do not create a new DM, just tell that the creation is successful by passing the existing roomId
@@ -119,7 +124,7 @@ class CreateDirectRoomViewModel @AssistedInject constructor(
                     }
 
             val result = runCatchingToAsync {
-                session.createRoom(roomParams)
+                session.roomService().createRoom(roomParams)
             }
             analyticsTracker.capture(CreatedRoom(isDM = roomParams.isDirect.orFalse()))
 
diff --git a/vector/src/main/java/im/vector/app/features/createdirect/DirectRoomHelper.kt b/vector/src/main/java/im/vector/app/features/createdirect/DirectRoomHelper.kt
index e9f0cbfea4..de2027f2a5 100644
--- a/vector/src/main/java/im/vector/app/features/createdirect/DirectRoomHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/DirectRoomHelper.kt
@@ -34,7 +34,7 @@ class DirectRoomHelper @Inject constructor(
 ) {
 
     suspend fun ensureDMExists(userId: String): String {
-        val existingRoomId = tryOrNull { session.getExistingDirectRoomWithUser(userId) }
+        val existingRoomId = tryOrNull { session.roomService().getExistingDirectRoomWithUser(userId) }
         val roomId: String
         if (existingRoomId != null) {
             roomId = existingRoomId
@@ -48,7 +48,7 @@ class DirectRoomHelper @Inject constructor(
                 setDirectMessage()
                 enableEncryptionIfInvitedUsersSupportIt = adminE2EByDefault
             }
-            roomId = session.createRoom(roomParams)
+            roomId = session.roomService().createRoom(roomParams)
             analyticsTracker.capture(CreatedRoom(isDM = roomParams.isDirect.orFalse()))
         }
         return roomId
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
index 40ad1372fb..42605a850b 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
@@ -31,7 +31,7 @@ import org.matrix.android.sdk.api.extensions.tryOrNull
 import javax.inject.Inject
 
 class KeysBackupRestoreFromKeyFragment @Inject constructor() :
-    VectorBaseFragment<FragmentKeysBackupRestoreFromKeyBinding>() {
+        VectorBaseFragment<FragmentKeysBackupRestoreFromKeyBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentKeysBackupRestoreFromKeyBinding {
         return FragmentKeysBackupRestoreFromKeyBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt
index cf684680ba..a8c3f41efe 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt
@@ -83,29 +83,45 @@ class KeysBackupRestoreSharedViewModel @Inject constructor(
     val progressObserver = object : StepProgressListener {
         override fun onStepProgress(step: StepProgressListener.Step) {
             when (step) {
-                is StepProgressListener.Step.ComputingKey   -> {
-                    loadingEvent.postValue(WaitingViewData(stringProvider.getString(R.string.keys_backup_restoring_waiting_message) +
-                            "\n" + stringProvider.getString(R.string.keys_backup_restoring_computing_key_waiting_message),
-                            step.progress,
-                            step.total))
+                is StepProgressListener.Step.ComputingKey  -> {
+                    loadingEvent.postValue(
+                            WaitingViewData(
+                                    stringProvider.getString(R.string.keys_backup_restoring_waiting_message) +
+                                            "\n" + stringProvider.getString(R.string.keys_backup_restoring_computing_key_waiting_message),
+                                    step.progress,
+                                    step.total
+                            )
+                    )
                 }
                 is StepProgressListener.Step.DownloadingKey -> {
-                    loadingEvent.postValue(WaitingViewData(stringProvider.getString(R.string.keys_backup_restoring_waiting_message) +
-                            "\n" + stringProvider.getString(R.string.keys_backup_restoring_downloading_backup_waiting_message),
-                            isIndeterminate = true))
+                    loadingEvent.postValue(
+                            WaitingViewData(
+                                    stringProvider.getString(R.string.keys_backup_restoring_waiting_message) +
+                                            "\n" + stringProvider.getString(R.string.keys_backup_restoring_downloading_backup_waiting_message),
+                                    isIndeterminate = true
+                            )
+                    )
                 }
-                is StepProgressListener.Step.ImportingKey   -> {
+                is StepProgressListener.Step.ImportingKey  -> {
                     Timber.d("backupKeys.ImportingKey.progress: ${step.progress}")
                     // Progress 0 can take a while, display an indeterminate progress in this case
                     if (step.progress == 0) {
-                        loadingEvent.postValue(WaitingViewData(stringProvider.getString(R.string.keys_backup_restoring_waiting_message) +
-                                "\n" + stringProvider.getString(R.string.keys_backup_restoring_importing_keys_waiting_message),
-                                isIndeterminate = true))
+                        loadingEvent.postValue(
+                                WaitingViewData(
+                                        stringProvider.getString(R.string.keys_backup_restoring_waiting_message) +
+                                                "\n" + stringProvider.getString(R.string.keys_backup_restoring_importing_keys_waiting_message),
+                                        isIndeterminate = true
+                                )
+                        )
                     } else {
-                        loadingEvent.postValue(WaitingViewData(stringProvider.getString(R.string.keys_backup_restoring_waiting_message) +
-                                "\n" + stringProvider.getString(R.string.keys_backup_restoring_importing_keys_waiting_message),
-                                step.progress,
-                                step.total))
+                        loadingEvent.postValue(
+                                WaitingViewData(
+                                        stringProvider.getString(R.string.keys_backup_restoring_waiting_message) +
+                                                "\n" + stringProvider.getString(R.string.keys_backup_restoring_importing_keys_waiting_message),
+                                        step.progress,
+                                        step.total
+                                )
+                        )
                     }
                 }
             }
@@ -170,7 +186,7 @@ class KeysBackupRestoreSharedViewModel @Inject constructor(
     fun handleGotSecretFromSSSS(cipherData: String, alias: String) {
         try {
             cipherData.fromBase64().inputStream().use { ins ->
-                val res = session.loadSecureSecret<Map<String, String>>(ins, alias)
+                val res = session.secureStorageService().loadSecureSecret<Map<String, String>>(ins, alias)
                 val secret = res?.get(KEYBACKUP_SECRET_SSSS_NAME)
                 if (secret == null) {
                     _navigateEvent.postValue(
@@ -205,7 +221,8 @@ class KeysBackupRestoreSharedViewModel @Inject constructor(
 
         try {
             val result = awaitCallback<ImportRoomKeysResult> {
-                keysBackup.restoreKeyBackupWithPassword(keyVersion,
+                keysBackup.restoreKeyBackupWithPassword(
+                        keyVersion,
                         passphrase,
                         null,
                         session.myUserId,
@@ -230,7 +247,8 @@ class KeysBackupRestoreSharedViewModel @Inject constructor(
 
         try {
             val result = awaitCallback<ImportRoomKeysResult> {
-                keysBackup.restoreKeysWithRecoveryKey(keyVersion,
+                keysBackup.restoreKeysWithRecoveryKey(
+                        keyVersion,
                         recoveryKey,
                         null,
                         session.myUserId,
@@ -252,7 +270,7 @@ class KeysBackupRestoreSharedViewModel @Inject constructor(
                 ?: return false
 
         // Some sanity ?
-        val defaultKeyResult = session.sharedSecretStorageService.getDefaultKey()
+        val defaultKeyResult = session.sharedSecretStorageService().getDefaultKey()
         val keyInfo = (defaultKeyResult as? KeyInfoResult.Success)?.keyInfo
                 ?: return false
 
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
index c4663fd3bc..d26c1e2134 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
@@ -40,10 +40,14 @@ class KeysBackupRestoreSuccessFragment @Inject constructor() : VectorBaseFragmen
 
         if (compareValues(sharedViewModel.importKeyResult?.totalNumberOfKeys, 0) > 0) {
             sharedViewModel.importKeyResult?.let {
-                val part1 = resources.getQuantityString(R.plurals.keys_backup_restore_success_description_part1,
-                        it.totalNumberOfKeys, it.totalNumberOfKeys)
-                val part2 = resources.getQuantityString(R.plurals.keys_backup_restore_success_description_part2,
-                        it.successfullyNumberOfImportedKeys, it.successfullyNumberOfImportedKeys)
+                val part1 = resources.getQuantityString(
+                        R.plurals.keys_backup_restore_success_description_part1,
+                        it.totalNumberOfKeys, it.totalNumberOfKeys
+                )
+                val part2 = resources.getQuantityString(
+                        R.plurals.keys_backup_restore_success_description_part2,
+                        it.successfullyNumberOfImportedKeys, it.successfullyNumberOfImportedKeys
+                )
                 views.successDetailsText.text = String.format("%s\n%s", part1, part2)
             }
             // We don't put emoji in string xml as it will crash on old devices
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt
index 50d5e56483..4d3ec9a820 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt
@@ -32,7 +32,7 @@ import im.vector.app.features.crypto.keysbackup.setup.KeysBackupSetupActivity
 import javax.inject.Inject
 
 class KeysBackupSettingsFragment @Inject constructor(private val keysBackupSettingsRecyclerViewController: KeysBackupSettingsRecyclerViewController) :
-    VectorBaseFragment<FragmentKeysBackupSettingsBinding>(),
+        VectorBaseFragment<FragmentKeysBackupSettingsBinding>(),
         KeysBackupSettingsRecyclerViewController.Listener {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentKeysBackupSettingsBinding {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt
index 9bf8050939..d281360678 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt
@@ -132,9 +132,11 @@ class KeysBackupSettingsRecyclerViewController @Inject constructor(
                     if (data.keysBackupVersionTrust()?.usable == false) {
                         description(host.stringProvider.getString(R.string.keys_backup_settings_untrusted_backup).toEpoxyCharSequence())
                     } else {
-                        description(host.stringProvider
-                                .getQuantityString(R.plurals.keys_backup_info_keys_backing_up, remainingKeysToBackup, remainingKeysToBackup)
-                                .toEpoxyCharSequence())
+                        description(
+                                host.stringProvider
+                                        .getQuantityString(R.plurals.keys_backup_info_keys_backing_up, remainingKeysToBackup, remainingKeysToBackup)
+                                        .toEpoxyCharSequence()
+                        )
                     }
                 }
 
@@ -200,27 +202,35 @@ class KeysBackupSettingsRecyclerViewController @Inject constructor(
                         val deviceId: String = it.deviceId ?: ""
 
                         if (!isDeviceKnown) {
-                            description(host.stringProvider
-                                    .getString(R.string.keys_backup_settings_signature_from_unknown_device, deviceId)
-                                    .toEpoxyCharSequence())
+                            description(
+                                    host.stringProvider
+                                            .getString(R.string.keys_backup_settings_signature_from_unknown_device, deviceId)
+                                            .toEpoxyCharSequence()
+                            )
                             endIconResourceId(R.drawable.e2e_warning)
                         } else {
                             if (isSignatureValid) {
                                 if (host.session.sessionParams.deviceId == it.deviceId) {
-                                    description(host.stringProvider
-                                            .getString(R.string.keys_backup_settings_valid_signature_from_this_device)
-                                            .toEpoxyCharSequence())
+                                    description(
+                                            host.stringProvider
+                                                    .getString(R.string.keys_backup_settings_valid_signature_from_this_device)
+                                                    .toEpoxyCharSequence()
+                                    )
                                     endIconResourceId(R.drawable.e2e_verified)
                                 } else {
                                     if (isDeviceVerified) {
-                                        description(host.stringProvider
-                                                .getString(R.string.keys_backup_settings_valid_signature_from_verified_device, deviceId)
-                                                .toEpoxyCharSequence())
+                                        description(
+                                                host.stringProvider
+                                                        .getString(R.string.keys_backup_settings_valid_signature_from_verified_device, deviceId)
+                                                        .toEpoxyCharSequence()
+                                        )
                                         endIconResourceId(R.drawable.e2e_verified)
                                     } else {
-                                        description(host.stringProvider
-                                                .getString(R.string.keys_backup_settings_valid_signature_from_unverified_device, deviceId)
-                                                .toEpoxyCharSequence())
+                                        description(
+                                                host.stringProvider
+                                                        .getString(R.string.keys_backup_settings_valid_signature_from_unverified_device, deviceId)
+                                                        .toEpoxyCharSequence()
+                                        )
                                         endIconResourceId(R.drawable.e2e_warning)
                                     }
                                 }
@@ -228,13 +238,17 @@ class KeysBackupSettingsRecyclerViewController @Inject constructor(
                                 // Invalid signature
                                 endIconResourceId(R.drawable.e2e_warning)
                                 if (isDeviceVerified) {
-                                    description(host.stringProvider
-                                            .getString(R.string.keys_backup_settings_invalid_signature_from_verified_device, deviceId)
-                                            .toEpoxyCharSequence())
+                                    description(
+                                            host.stringProvider
+                                                    .getString(R.string.keys_backup_settings_invalid_signature_from_verified_device, deviceId)
+                                                    .toEpoxyCharSequence()
+                                    )
                                 } else {
-                                    description(host.stringProvider
-                                            .getString(R.string.keys_backup_settings_invalid_signature_from_unverified_device, deviceId)
-                                            .toEpoxyCharSequence())
+                                    description(
+                                            host.stringProvider
+                                                    .getString(R.string.keys_backup_settings_invalid_signature_from_unverified_device, deviceId)
+                                                    .toEpoxyCharSequence()
+                                    )
                                 }
                             }
                         }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt
index 34aa7ba0ee..dfa7d1aaa3 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt
@@ -22,6 +22,7 @@ import androidx.lifecycle.ViewModel
 import com.nulabinc.zxcvbn.Strength
 import im.vector.app.R
 import im.vector.app.core.platform.WaitingViewData
+import im.vector.app.core.time.Clock
 import im.vector.app.core.utils.LiveEvent
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.listeners.ProgressListener
@@ -37,7 +38,9 @@ import javax.inject.Inject
 /**
  * The shared view model between all fragments.
  */
-class KeysBackupSetupSharedViewModel @Inject constructor() : ViewModel() {
+class KeysBackupSetupSharedViewModel @Inject constructor(
+        private val clock: Clock,
+) : ViewModel() {
 
     companion object {
         const val NAVIGATE_TO_STEP_2 = "NAVIGATE_TO_STEP_2"
@@ -85,7 +88,7 @@ class KeysBackupSetupSharedViewModel @Inject constructor() : ViewModel() {
 
     fun prepareRecoveryKey(context: Context, withPassphrase: String?) {
         // Update requestId
-        currentRequestId.value = System.currentTimeMillis()
+        currentRequestId.value = clock.epochMillis()
         isCreatingBackupVersion.value = true
 
         recoveryKey.value = null
@@ -101,9 +104,11 @@ class KeysBackupSetupSharedViewModel @Inject constructor() : ViewModel() {
                                 return
                             }
 
-                            loadingStatus.value = WaitingViewData(context.getString(R.string.keys_backup_setup_step3_generating_key_status),
+                            loadingStatus.value = WaitingViewData(
+                                    context.getString(R.string.keys_backup_setup_step3_generating_key_status),
                                     progress,
-                                    total)
+                                    total
+                            )
                         }
                     },
                     object : MatrixCallback<MegolmBackupCreationInfo> {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
index e5d7ade3ce..61148f3aab 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
@@ -146,7 +146,8 @@ class KeysBackupSetupStep3Fragment @Inject constructor() : VectorBaseFragment<Fr
                     activityResultLauncher = null,
                     chooserTitle = context?.getString(R.string.keys_backup_setup_step3_share_intent_chooser_title),
                     text = recoveryKey,
-                    subject = context?.getString(R.string.recovery_key))
+                    subject = context?.getString(R.string.recovery_key)
+            )
             viewModel.copyHasBeenMade = true
             dialog.dismiss()
         }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
index 0a105064d5..8ca1dec6d7 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
@@ -154,11 +154,13 @@ class SharedSecureStorageActivity :
                       resultKeyStoreAlias: String = DEFAULT_RESULT_KEYSTORE_ALIAS): Intent {
             require(requestedSecrets.isNotEmpty())
             return Intent(context, SharedSecureStorageActivity::class.java).also {
-                it.putExtra(Mavericks.KEY_ARG, Args(
+                it.putExtra(
+                        Mavericks.KEY_ARG, Args(
                         keyId,
                         requestedSecrets,
                         resultKeyStoreAlias
-                ))
+                )
+                )
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt
index 51d8b3a8d5..3fafda54a3 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt
@@ -76,7 +76,7 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
         @Assisted private val initialState: SharedSecureStorageViewState,
         private val stringProvider: StringProvider,
         private val session: Session) :
-    VectorViewModel<SharedSecureStorageViewState, SharedSecureStorageAction, SharedSecureStorageViewEvent>(initialState) {
+        VectorViewModel<SharedSecureStorageViewState, SharedSecureStorageAction, SharedSecureStorageViewEvent>(initialState) {
 
     @AssistedFactory
     interface Factory : MavericksAssistedViewModelFactory<SharedSecureStorageViewModel, SharedSecureStorageViewState> {
@@ -87,8 +87,8 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
         setState {
             copy(userId = session.myUserId)
         }
-        val integrityResult = session.sharedSecretStorageService.checkShouldBeAbleToAccessSecrets(initialState.requestedSecrets, initialState.keyId)
-        if (integrityResult  !is IntegrityResult.Success) {
+        val integrityResult = session.sharedSecretStorageService().checkShouldBeAbleToAccessSecrets(initialState.requestedSecrets, initialState.keyId)
+        if (integrityResult !is IntegrityResult.Success) {
             _viewEvents.post(
                     SharedSecureStorageViewEvent.Error(
                             stringProvider.getString(R.string.enter_secret_storage_invalid),
@@ -96,8 +96,8 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
                     )
             )
         }
-        val keyResult = initialState.keyId?.let { session.sharedSecretStorageService.getKey(it) }
-                ?: session.sharedSecretStorageService.getDefaultKey()
+        val keyResult = initialState.keyId?.let { session.sharedSecretStorageService().getKey(it) }
+                ?: session.sharedSecretStorageService().getDefaultKey()
 
         if (!keyResult.isSuccess()) {
             _viewEvents.post(SharedSecureStorageViewEvent.Dismiss)
@@ -134,13 +134,13 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
 
     override fun handle(action: SharedSecureStorageAction) = withState {
         when (action) {
-            is SharedSecureStorageAction.Cancel                   -> handleCancel()
-            is SharedSecureStorageAction.SubmitPassphrase         -> handleSubmitPassphrase(action)
-            SharedSecureStorageAction.UseKey                      -> handleUseKey()
-            is SharedSecureStorageAction.SubmitKey                -> handleSubmitKey(action)
-            SharedSecureStorageAction.Back                        -> handleBack()
-            SharedSecureStorageAction.ForgotResetAll              -> handleResetAll()
-            SharedSecureStorageAction.DoResetAll                  -> handleDoResetAll()
+            is SharedSecureStorageAction.Cancel           -> handleCancel()
+            is SharedSecureStorageAction.SubmitPassphrase -> handleSubmitPassphrase(action)
+            SharedSecureStorageAction.UseKey              -> handleUseKey()
+            is SharedSecureStorageAction.SubmitKey        -> handleSubmitKey(action)
+            SharedSecureStorageAction.Back                -> handleBack()
+            SharedSecureStorageAction.ForgotResetAll      -> handleResetAll()
+            SharedSecureStorageAction.DoResetAll          -> handleDoResetAll()
         }
     }
 
@@ -205,7 +205,7 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
         viewModelScope.launch(Dispatchers.IO) {
             runCatching {
                 val recoveryKey = action.recoveryKey
-                val keyInfoResult = session.sharedSecretStorageService.getDefaultKey()
+                val keyInfoResult = session.sharedSecretStorageService().getDefaultKey()
                 if (!keyInfoResult.isSuccess()) {
                     _viewEvents.post(SharedSecureStorageViewEvent.HideModalLoading)
                     _viewEvents.post(SharedSecureStorageViewEvent.Error(stringProvider.getString(R.string.failed_to_access_secure_storage)))
@@ -213,12 +213,14 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
                 }
                 val keyInfo = (keyInfoResult as KeyInfoResult.Success).keyInfo
 
-                _viewEvents.post(SharedSecureStorageViewEvent.UpdateLoadingState(
-                        WaitingViewData(
-                                message = stringProvider.getString(R.string.keys_backup_restoring_computing_key_waiting_message),
-                                isIndeterminate = true
+                _viewEvents.post(
+                        SharedSecureStorageViewEvent.UpdateLoadingState(
+                                WaitingViewData(
+                                        message = stringProvider.getString(R.string.keys_backup_restoring_computing_key_waiting_message),
+                                        isIndeterminate = true
+                                )
                         )
-                ))
+                )
                 val keySpec = RawBytesKeySpec.fromRecoveryKey(recoveryKey) ?: return@launch Unit.also {
                     _viewEvents.post(SharedSecureStorageViewEvent.KeyInlineError(stringProvider.getString(R.string.bootstrap_invalid_recovery_key)))
                     _viewEvents.post(SharedSecureStorageViewEvent.HideModalLoading)
@@ -228,10 +230,11 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
                 withContext(Dispatchers.IO) {
                     initialState.requestedSecrets.forEach {
                         if (session.accountDataService().getUserAccountDataEvent(it) != null) {
-                            val res = session.sharedSecretStorageService.getSecret(
+                            val res = session.sharedSecretStorageService().getSecret(
                                     name = it,
                                     keyId = keyInfo.id,
-                                    secretKey = keySpec)
+                                    secretKey = keySpec
+                            )
                             decryptedSecretMap[it] = res
                         } else {
                             Timber.w("## Cannot find secret $it in SSSS, skip")
@@ -243,7 +246,7 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
                 _viewEvents.post(SharedSecureStorageViewEvent.HideModalLoading)
                 val safeForIntentCypher = ByteArrayOutputStream().also {
                     it.use {
-                        session.securelyStoreObject(decryptedSecretMap as Map<String, String>, initialState.resultKeyStoreAlias, it)
+                        session.secureStorageService().securelyStoreObject(decryptedSecretMap as Map<String, String>, initialState.resultKeyStoreAlias, it)
                     }
                 }.toByteArray().toBase64NoPadding()
                 _viewEvents.post(SharedSecureStorageViewEvent.FinishSuccess(safeForIntentCypher))
@@ -262,7 +265,7 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
         viewModelScope.launch(Dispatchers.IO) {
             runCatching {
                 val passphrase = action.passphrase
-                val keyInfoResult = session.sharedSecretStorageService.getDefaultKey()
+                val keyInfoResult = session.sharedSecretStorageService().getDefaultKey()
                 if (!keyInfoResult.isSuccess()) {
                     _viewEvents.post(SharedSecureStorageViewEvent.HideModalLoading)
                     _viewEvents.post(SharedSecureStorageViewEvent.Error("Cannot find ssss key"))
@@ -270,26 +273,30 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
                 }
                 val keyInfo = (keyInfoResult as KeyInfoResult.Success).keyInfo
 
-                _viewEvents.post(SharedSecureStorageViewEvent.UpdateLoadingState(
-                        WaitingViewData(
-                                message = stringProvider.getString(R.string.keys_backup_restoring_computing_key_waiting_message),
-                                isIndeterminate = true
+                _viewEvents.post(
+                        SharedSecureStorageViewEvent.UpdateLoadingState(
+                                WaitingViewData(
+                                        message = stringProvider.getString(R.string.keys_backup_restoring_computing_key_waiting_message),
+                                        isIndeterminate = true
+                                )
                         )
-                ))
+                )
                 val keySpec = RawBytesKeySpec.fromPassphrase(
                         passphrase,
                         keyInfo.content.passphrase?.salt ?: "",
                         keyInfo.content.passphrase?.iterations ?: 0,
                         object : ProgressListener {
                             override fun onProgress(progress: Int, total: Int) {
-                                _viewEvents.post(SharedSecureStorageViewEvent.UpdateLoadingState(
-                                        WaitingViewData(
-                                                message = stringProvider.getString(R.string.keys_backup_restoring_computing_key_waiting_message),
-                                                isIndeterminate = false,
-                                                progress = progress,
-                                                progressTotal = total
+                                _viewEvents.post(
+                                        SharedSecureStorageViewEvent.UpdateLoadingState(
+                                                WaitingViewData(
+                                                        message = stringProvider.getString(R.string.keys_backup_restoring_computing_key_waiting_message),
+                                                        isIndeterminate = false,
+                                                        progress = progress,
+                                                        progressTotal = total
+                                                )
                                         )
-                                ))
+                                )
                             }
                         }
                 )
@@ -297,10 +304,11 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
                 withContext(Dispatchers.IO) {
                     initialState.requestedSecrets.forEach {
                         if (session.accountDataService().getUserAccountDataEvent(it) != null) {
-                            val res = session.sharedSecretStorageService.getSecret(
+                            val res = session.sharedSecretStorageService().getSecret(
                                     name = it,
                                     keyId = keyInfo.id,
-                                    secretKey = keySpec)
+                                    secretKey = keySpec
+                            )
                             decryptedSecretMap[it] = res
                         } else {
                             Timber.w("## Cannot find secret $it in SSSS, skip")
@@ -312,7 +320,7 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
                 _viewEvents.post(SharedSecureStorageViewEvent.HideModalLoading)
                 val safeForIntentCypher = ByteArrayOutputStream().also {
                     it.use {
-                        session.securelyStoreObject(decryptedSecretMap as Map<String, String>, initialState.resultKeyStoreAlias, it)
+                        session.secureStorageService().securelyStoreObject(decryptedSecretMap as Map<String, String>, initialState.resultKeyStoreAlias, it)
                     }
                 }.toByteArray().toBase64NoPadding()
                 _viewEvents.post(SharedSecureStorageViewEvent.FinishSuccess(safeForIntentCypher))
diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt
index 200b2b73c2..c0d0aa8e76 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt
@@ -30,7 +30,7 @@ import im.vector.app.features.roommemberprofile.devices.DeviceListBottomSheet
 import javax.inject.Inject
 
 class SharedSecuredStorageResetAllFragment @Inject constructor() :
-    VectorBaseFragment<FragmentSsssResetAllBinding>() {
+        VectorBaseFragment<FragmentSsssResetAllBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSsssResetAllBinding {
         return FragmentSsssResetAllBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt
index 1767a9444d..bc756974ad 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt
@@ -61,7 +61,7 @@ class BackupToQuadSMigrationTask @Inject constructor(
             // We need to use the current secret for keybackup and use it as the new master key for SSSS
             // Then we need to put back the backup key in sss
             val keysBackupService = session.cryptoService().keysBackupService()
-            val quadS = session.sharedSecretStorageService
+            val quadS = session.sharedSecretStorageService()
 
             val version = keysBackupService.keysBackupVersion ?: return Result.NoKeyBackupVersion
 
@@ -77,10 +77,14 @@ class BackupToQuadSMigrationTask @Inject constructor(
                                     authData.privateKeyIterations!!,
                                     object : ProgressListener {
                                         override fun onProgress(progress: Int, total: Int) {
-                                            params.progressListener?.onProgress(WaitingViewData(
-                                                    stringProvider.getString(R.string.bootstrap_progress_checking_backup_with_info,
-                                                            "$progress/$total")
-                                            ))
+                                            params.progressListener?.onProgress(
+                                                    WaitingViewData(
+                                                            stringProvider.getString(
+                                                                    R.string.bootstrap_progress_checking_backup_with_info,
+                                                                    "$progress/$total"
+                                                            )
+                                                    )
+                                            )
                                         }
                                     })
                         }
@@ -111,8 +115,10 @@ class BackupToQuadSMigrationTask @Inject constructor(
                                                     WaitingViewData(
                                                             stringProvider.getString(
                                                                     R.string.bootstrap_progress_generating_ssss_with_info,
-                                                                    "$progress/$total")
-                                                    ))
+                                                                    "$progress/$total"
+                                                            )
+                                                    )
+                                            )
                                         }
                                     }
                             )
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapActions.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapActions.kt
index 363416b7de..395b4d0475 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapActions.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapActions.kt
@@ -37,7 +37,7 @@ sealed class BootstrapActions : VectorViewModelAction {
     data class UpdateCandidatePassphrase(val pass: String) : BootstrapActions()
     data class UpdateConfirmCandidatePassphrase(val pass: String) : BootstrapActions()
 
-//    data class ReAuth(val pass: String) : BootstrapActions()
+    //    data class ReAuth(val pass: String) : BootstrapActions()
     object RecoveryKeySaved : BootstrapActions()
     object Completed : BootstrapActions()
     object SaveReqQueryStarted : BootstrapActions()
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
index ac7662ca59..b8d168cca5 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
@@ -64,7 +64,7 @@ class BootstrapBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetBoot
     private val reAuthActivityResultLauncher = registerStartForActivityResult { activityResult ->
         if (activityResult.resultCode == Activity.RESULT_OK) {
             when (activityResult.data?.extras?.getString(ReAuthActivity.RESULT_FLOW_TYPE)) {
-                LoginFlowTypes.SSO -> {
+                LoginFlowTypes.SSO      -> {
                     viewModel.handle(BootstrapActions.SsoAuthDone)
                 }
                 LoginFlowTypes.PASSWORD -> {
@@ -102,10 +102,12 @@ class BootstrapBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetBoot
                     promptSkip()
                 }
                 is BootstrapViewEvents.RequestReAuth -> {
-                    ReAuthActivity.newIntent(requireContext(),
+                    ReAuthActivity.newIntent(
+                            requireContext(),
                             event.flowResponse,
                             event.lastErrorCode,
-                            getString(R.string.initialize_cross_signing)).let { intent ->
+                            getString(R.string.initialize_cross_signing)
+                    ).let { intent ->
                         reAuthActivityResultLauncher.launch(intent)
                     }
                 }
@@ -201,9 +203,11 @@ class BootstrapBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetBoot
                 val isKey = state.step.useKey()
                 val drawableRes = if (isKey) R.drawable.ic_security_key_24dp else R.drawable.ic_security_phrase_24dp
                 views.bootstrapIcon.isVisible = true
-                views.bootstrapIcon.setImageDrawable(ContextCompat.getDrawable(
-                        requireContext(),
-                        drawableRes)
+                views.bootstrapIcon.setImageDrawable(
+                        ContextCompat.getDrawable(
+                                requireContext(),
+                                drawableRes
+                        )
                 )
                 views.bootstrapTitleText.text = getString(R.string.upgrade_security)
                 showFragment(BootstrapMigrateBackupFragment::class)
@@ -227,7 +231,8 @@ class BootstrapBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetBoot
     private fun showFragment(fragmentClass: KClass<out Fragment>, argsParcelable: Parcelable? = null) {
         if (childFragmentManager.findFragmentByTag(fragmentClass.simpleName) == null) {
             childFragmentManager.commitTransaction {
-                replace(R.id.bottomSheetFragmentContainer,
+                replace(
+                        R.id.bottomSheetFragmentContainer,
                         fragmentClass.java,
                         argsParcelable?.toMvRxBundle(),
                         fragmentClass.simpleName
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt
index 8a211388ed..7920ab3b96 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt
@@ -37,7 +37,7 @@ import reactivecircus.flowbinding.android.widget.textChanges
 import javax.inject.Inject
 
 class BootstrapConfirmPassphraseFragment @Inject constructor() :
-    VectorBaseFragment<FragmentBootstrapEnterPassphraseBinding>() {
+        VectorBaseFragment<FragmentBootstrapEnterPassphraseBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentBootstrapEnterPassphraseBinding {
         return FragmentBootstrapEnterPassphraseBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
index f65999b945..c26aec45dd 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
@@ -117,12 +117,13 @@ class BootstrapCrossSigningTask @Inject constructor(
 
         val keyInfo: SsssKeyCreationInfo
 
-        val ssssService = session.sharedSecretStorageService
+        val ssssService = session.sharedSecretStorageService()
 
         params.progressListener?.onProgress(
                 WaitingViewData(
                         stringProvider.getString(R.string.bootstrap_crosssigning_progress_pbkdf2),
-                        isIndeterminate = true)
+                        isIndeterminate = true
+                )
         )
 
         Timber.d("## BootstrapCrossSigningTask: Creating 4S key with pass: ${params.passphrase != null}")
@@ -151,7 +152,8 @@ class BootstrapCrossSigningTask @Inject constructor(
         params.progressListener?.onProgress(
                 WaitingViewData(
                         stringProvider.getString(R.string.bootstrap_crosssigning_progress_default_key),
-                        isIndeterminate = true)
+                        isIndeterminate = true
+                )
         )
 
         Timber.d("## BootstrapCrossSigningTask: Creating 4S - Set default key")
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapEnterPassphraseFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapEnterPassphraseFragment.kt
index 51430ba12e..ff6d109b3c 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapEnterPassphraseFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapEnterPassphraseFragment.kt
@@ -36,7 +36,7 @@ import reactivecircus.flowbinding.android.widget.textChanges
 import javax.inject.Inject
 
 class BootstrapEnterPassphraseFragment @Inject constructor() :
-    VectorBaseFragment<FragmentBootstrapEnterPassphraseBinding>() {
+        VectorBaseFragment<FragmentBootstrapEnterPassphraseBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentBootstrapEnterPassphraseBinding {
         return FragmentBootstrapEnterPassphraseBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt
index 2765dfefd3..3be2f020b8 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt
@@ -29,7 +29,7 @@ import im.vector.app.databinding.FragmentBootstrapSetupRecoveryBinding
 import javax.inject.Inject
 
 class BootstrapSetupRecoveryKeyFragment @Inject constructor() :
-    VectorBaseFragment<FragmentBootstrapSetupRecoveryBinding>() {
+        VectorBaseFragment<FragmentBootstrapSetupRecoveryBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentBootstrapSetupRecoveryBinding {
         return FragmentBootstrapSetupRecoveryBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
index 1b69b3a919..b67970e61f 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
@@ -246,7 +246,8 @@ class BootstrapSharedViewModel @AssistedInject constructor(
                 uiaContinuation?.resume(DefaultBaseAuth(session = pendingAuth?.session ?: ""))
             }
             is BootstrapActions.PasswordAuthDone                 -> {
-                val decryptedPass = session.loadSecureSecret<String>(action.password.fromBase64().inputStream(), ReAuthActivity.DEFAULT_RESULT_KEYSTORE_ALIAS)
+                val decryptedPass = session.secureStorageService()
+                        .loadSecureSecret<String>(action.password.fromBase64().inputStream(), ReAuthActivity.DEFAULT_RESULT_KEYSTORE_ALIAS)
                 uiaContinuation?.resume(
                         UserPasswordAuth(
                                 session = pendingAuth?.session,
@@ -403,7 +404,8 @@ class BootstrapSharedViewModel @AssistedInject constructor(
         }
 
         viewModelScope.launch(Dispatchers.IO) {
-            bootstrapTask.invoke(this,
+            bootstrapTask.invoke(
+                    this,
                     Params(
                             userInteractiveAuthInterceptor = interceptor,
                             progressListener = progressListener,
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapWaitingFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapWaitingFragment.kt
index 8cf48a7c66..cc566833d8 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapWaitingFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapWaitingFragment.kt
@@ -26,7 +26,7 @@ import im.vector.app.databinding.FragmentBootstrapWaitingBinding
 import javax.inject.Inject
 
 class BootstrapWaitingFragment @Inject constructor() :
-    VectorBaseFragment<FragmentBootstrapWaitingBinding>() {
+        VectorBaseFragment<FragmentBootstrapWaitingBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentBootstrapWaitingBinding {
         return FragmentBootstrapWaitingBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
index 3a3f1054f1..e0aa4592a4 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
@@ -18,6 +18,8 @@ package im.vector.app.features.crypto.verification
 import android.content.Context
 import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.time.Clock
+import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.displayname.getBestName
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.RoomDetailActivity
@@ -42,7 +44,9 @@ import javax.inject.Singleton
 class IncomingVerificationRequestHandler @Inject constructor(
         private val context: Context,
         private var avatarRenderer: Provider<AvatarRenderer>,
-        private val popupAlertManager: PopupAlertManager) : VerificationService.Listener {
+        private val popupAlertManager: PopupAlertManager,
+        private val clock: Clock,
+) : VerificationService.Listener {
 
     private var session: Session? = null
 
@@ -61,9 +65,9 @@ class IncomingVerificationRequestHandler @Inject constructor(
         // TODO maybe check also if
         val uid = "kvr_${tx.transactionId}"
         when (tx.state) {
-            is VerificationTxState.OnStarted -> {
+            is VerificationTxState.OnStarted       -> {
                 // Add a notification for every incoming request
-                val user = session?.getUser(tx.otherUserId)
+                val user = session?.userService()?.getUser(tx.otherUserId)
                 val name = user?.toMatrixItem()?.getBestName() ?: tx.otherUserId
                 val alert = VerificationVectorAlert(
                         uid,
@@ -104,7 +108,7 @@ class IncomingVerificationRequestHandler @Inject constructor(
                                     }
                             )
                             // 10mn expiration
-                            expirationTimestamp = System.currentTimeMillis() + (10 * 60 * 1000L)
+                            expirationTimestamp = clock.epochMillis() + (10 * 60 * 1000L)
                         }
                 popupAlertManager.postVectorAlert(alert)
             }
@@ -127,7 +131,7 @@ class IncomingVerificationRequestHandler @Inject constructor(
                 // XXX this is a bit hard coded :/
                 popupAlertManager.cancelAlert("review_login")
             }
-            val user = session?.getUser(pr.otherUserId)?.toMatrixItem()
+            val user = session?.userService()?.getUser(pr.otherUserId)?.toMatrixItem()
             val name = user?.getBestName() ?: pr.otherUserId
             val description = if (name == pr.otherUserId) {
                 name
@@ -156,19 +160,25 @@ class IncomingVerificationRequestHandler @Inject constructor(
                                 if (roomId.isNullOrBlank()) {
                                     it.navigator.waitSessionVerification(it)
                                 } else {
-                                    it.navigator.openRoom(it, roomId, pr.transactionId)
+                                    it.navigator.openRoom(
+                                            context = it,
+                                            roomId = roomId,
+                                            eventId = pr.transactionId,
+                                            trigger = ViewRoom.Trigger.VerificationRequest
+                                    )
                                 }
                             }
                         }
                         dismissedAction = Runnable {
-                            session?.cryptoService()?.verificationService()?.declineVerificationRequestInDMs(pr.otherUserId,
+                            session?.cryptoService()?.verificationService()?.declineVerificationRequestInDMs(
+                                    pr.otherUserId,
                                     pr.transactionId ?: "",
                                     pr.roomId ?: ""
                             )
                         }
                         colorAttribute = R.attr.vctr_notice_secondary
                         // 5mn expiration
-                        expirationTimestamp = System.currentTimeMillis() + (5 * 60 * 1000L)
+                        expirationTimestamp = clock.epochMillis() + (5 * 60 * 1000L)
                     }
             popupAlertManager.postVectorAlert(alert)
         }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/SupportedVerificationMethodsProvider.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/SupportedVerificationMethodsProvider.kt
index 00ba676926..6bbd37a3a8 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/SupportedVerificationMethodsProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/SupportedVerificationMethodsProvider.kt
@@ -33,7 +33,8 @@ class SupportedVerificationMethodsProvider @Inject constructor(
                 // Element supports SAS verification
                 VerificationMethod.SAS,
                 // Element is able to show QR codes
-                VerificationMethod.QR_CODE_SHOW)
+                VerificationMethod.QR_CODE_SHOW
+        )
                 .apply {
                     if (hardwareInfo.hasBackCamera()) {
                         // Element is able to scan QR codes, and a Camera is available
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
index 18a1363d71..9c6c22b6ca 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
@@ -95,12 +95,14 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
             when (it) {
                 is VerificationBottomSheetViewEvents.Dismiss           -> dismiss()
                 is VerificationBottomSheetViewEvents.AccessSecretStore -> {
-                    secretStartForActivityResult.launch(SharedSecureStorageActivity.newIntent(
-                            requireContext(),
-                            null, // use default key
-                            listOf(MASTER_KEY_SSSS_NAME, USER_SIGNING_KEY_SSSS_NAME, SELF_SIGNING_KEY_SSSS_NAME, KEYBACKUP_SECRET_SSSS_NAME),
-                            SharedSecureStorageActivity.DEFAULT_RESULT_KEYSTORE_ALIAS
-                    ))
+                    secretStartForActivityResult.launch(
+                            SharedSecureStorageActivity.newIntent(
+                                    requireContext(),
+                                    null, // use default key
+                                    listOf(MASTER_KEY_SSSS_NAME, USER_SIGNING_KEY_SSSS_NAME, SELF_SIGNING_KEY_SSSS_NAME, KEYBACKUP_SECRET_SSSS_NAME),
+                                    SharedSecureStorageActivity.DEFAULT_RESULT_KEYSTORE_ALIAS
+                            )
+                    )
                 }
                 is VerificationBottomSheetViewEvents.ModalError        -> {
                     MaterialAlertDialogBuilder(requireContext())
@@ -183,7 +185,8 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
                             isSuccessFull = true,
                             isMe = true,
                             cancelReason = null
-                    ))
+                    )
+            )
             return@withState
         }
 
@@ -348,7 +351,8 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
     private fun showFragment(fragmentClass: KClass<out Fragment>, argsParcelable: Parcelable? = null) {
         if (childFragmentManager.findFragmentByTag(fragmentClass.simpleName) == null) {
             childFragmentManager.commitTransaction {
-                replace(R.id.bottomSheetFragmentContainer,
+                replace(
+                        R.id.bottomSheetFragmentContainer,
                         fragmentClass.java,
                         argsParcelable?.toMvRxBundle(),
                         fragmentClass.simpleName
@@ -360,31 +364,37 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
     companion object {
         fun withArgs(roomId: String?, otherUserId: String, transactionId: String? = null): VerificationBottomSheet {
             return VerificationBottomSheet().apply {
-                setArguments(VerificationArgs(
-                        otherUserId = otherUserId,
-                        roomId = roomId,
-                        verificationId = transactionId,
-                        selfVerificationMode = false
-                ))
+                setArguments(
+                        VerificationArgs(
+                                otherUserId = otherUserId,
+                                roomId = roomId,
+                                verificationId = transactionId,
+                                selfVerificationMode = false
+                        )
+                )
             }
         }
 
         fun forSelfVerification(session: Session): VerificationBottomSheet {
             return VerificationBottomSheet().apply {
-                setArguments(VerificationArgs(
-                        otherUserId = session.myUserId,
-                        selfVerificationMode = true
-                ))
+                setArguments(
+                        VerificationArgs(
+                                otherUserId = session.myUserId,
+                                selfVerificationMode = true
+                        )
+                )
             }
         }
 
         fun forSelfVerification(session: Session, outgoingRequest: String): VerificationBottomSheet {
             return VerificationBottomSheet().apply {
-                setArguments(VerificationArgs(
-                        otherUserId = session.myUserId,
-                        selfVerificationMode = true,
-                        verificationId = outgoingRequest
-                ))
+                setArguments(
+                        VerificationArgs(
+                                otherUserId = session.myUserId,
+                                selfVerificationMode = true,
+                                verificationId = outgoingRequest
+                        )
+                )
             }
         }
 
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
index b389a831da..44694404bc 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
@@ -53,6 +53,7 @@ import org.matrix.android.sdk.api.session.crypto.verification.VerificationServic
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransaction
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
 import org.matrix.android.sdk.api.session.events.model.LocalEcho
+import org.matrix.android.sdk.api.session.getUser
 import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.awaitCallback
 import org.matrix.android.sdk.api.util.fromBase64
@@ -149,7 +150,7 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
                     pendingRequest = if (pr != null) Success(pr) else Uninitialized,
                     isMe = initialState.otherUserId == session.myUserId,
                     currentDeviceCanCrossSign = session.cryptoService().crossSigningService().canCrossSign(),
-                    quadSContainsSecrets = session.sharedSecretStorageService.isRecoverySetup(),
+                    quadSContainsSecrets = session.sharedSecretStorageService().isRecoverySetup(),
                     hasAnyOtherSession = hasAnyOtherSession
             )
         }
@@ -231,7 +232,7 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
     override fun handle(action: VerificationAction) = withState { state ->
         val otherUserId = state.otherUserMxItem?.id ?: return@withState
         val roomId = state.roomId
-                ?: session.getExistingDirectRoomWithUser(otherUserId)
+                ?: session.roomService().getExistingDirectRoomWithUser(otherUserId)
 
         when (action) {
             is VerificationAction.RequestVerificationByDM      -> {
@@ -244,7 +245,7 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
                         )
                     }
                     viewModelScope.launch {
-                        val result = runCatching { session.createDirectRoom(otherUserId) }
+                        val result = runCatching { session.roomService().createDirectRoom(otherUserId) }
                         result.fold(
                                 { data ->
                                     setState {
@@ -274,10 +275,11 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
                 } else {
                     setState {
                         copy(
-                                pendingRequest = Success(session
-                                        .cryptoService()
-                                        .verificationService()
-                                        .requestKeyVerificationInDMs(supportedVerificationMethodsProvider.provide(), otherUserId, roomId)
+                                pendingRequest = Success(
+                                        session
+                                                .cryptoService()
+                                                .verificationService()
+                                                .requestKeyVerificationInDMs(supportedVerificationMethodsProvider.provide(), otherUserId, roomId)
                                 )
                         )
                     }
@@ -372,7 +374,7 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
         viewModelScope.launch(Dispatchers.IO) {
             try {
                 action.cypherData.fromBase64().inputStream().use { ins ->
-                    val res = session.loadSecureSecret<Map<String, String>>(ins, action.alias)
+                    val res = session.secureStorageService().loadSecureSecret<Map<String, String>>(ins, action.alias)
                     val trustResult = session.cryptoService().crossSigningService().checkTrustFromPrivateKeys(
                             res?.get(MASTER_KEY_SSSS_NAME),
                             res?.get(USER_SIGNING_KEY_SSSS_NAME),
@@ -415,7 +417,8 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
                     )
                 }
                 _viewEvents.post(
-                        VerificationBottomSheetViewEvents.ModalError(failure.localizedMessage ?: stringProvider.getString(R.string.unexpected_error)))
+                        VerificationBottomSheetViewEvents.ModalError(failure.localizedMessage ?: stringProvider.getString(R.string.unexpected_error))
+                )
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
index 31a7956db3..cf6bcc58c0 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
@@ -74,9 +74,12 @@ class VerificationChooseMethodFragment @Inject constructor(
     }
 
     override fun doVerifyBySas() = withState(sharedViewModel) { state ->
-        sharedViewModel.handle(VerificationAction.StartSASVerification(
-                state.otherUserMxItem?.id ?: "",
-                state.pendingRequest.invoke()?.transactionId ?: ""))
+        sharedViewModel.handle(
+                VerificationAction.StartSASVerification(
+                        state.otherUserMxItem?.id ?: "",
+                        state.pendingRequest.invoke()?.transactionId ?: ""
+                )
+        )
     }
 
     private val openCameraActivityResultLauncher = registerForPermissionsResult { allGranted, deniedPermanently ->
@@ -115,10 +118,12 @@ class VerificationChooseMethodFragment @Inject constructor(
     }
 
     private fun onRemoteQrCodeScanned(remoteQrCode: String) = withState(sharedViewModel) { state ->
-        sharedViewModel.handle(VerificationAction.RemoteQrCodeScanned(
-                state.otherUserMxItem?.id ?: "",
-                state.pendingRequest.invoke()?.transactionId ?: "",
-                remoteQrCode
-        ))
+        sharedViewModel.handle(
+                VerificationAction.RemoteQrCodeScanned(
+                        state.otherUserMxItem?.id ?: "",
+                        state.pendingRequest.invoke()?.transactionId ?: "",
+                        remoteQrCode
+                )
+        )
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt
index 7696bb8f5b..a1f902f8f4 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt
@@ -102,7 +102,8 @@ class VerificationChooseMethodViewModel @AssistedInject constructor(
             // Get the QR code now, because transaction is already created, so transactionCreated() will not be called
             val qrCodeVerificationTransaction = verificationService.getExistingTransaction(args.otherUserId, args.verificationId ?: "")
 
-            return VerificationChooseMethodViewState(otherUserId = args.otherUserId,
+            return VerificationChooseMethodViewState(
+                    otherUserId = args.otherUserId,
                     isMe = session.myUserId == pvr?.otherUserId,
                     canCrossSign = session.cryptoService().crossSigningService().canCrossSign(),
                     transactionId = args.verificationId ?: "",
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt
index ee77444b2e..7f6678a73c 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt
@@ -52,10 +52,13 @@ class VerificationConclusionController @Inject constructor(
             ConclusionState.SUCCESS   -> {
                 bottomSheetVerificationNoticeItem {
                     id("notice")
-                    notice(host.stringProvider.getString(
-                            if (state.isSelfVerification) R.string.verification_conclusion_ok_self_notice
-                            else R.string.verification_conclusion_ok_notice)
-                            .toEpoxyCharSequence())
+                    notice(
+                            host.stringProvider.getString(
+                                    if (state.isSelfVerification) R.string.verification_conclusion_ok_self_notice
+                                    else R.string.verification_conclusion_ok_notice
+                            )
+                                    .toEpoxyCharSequence()
+                    )
                 }
 
                 bottomSheetVerificationBigImageItem {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionViewModel.kt
index 82bdbccdb3..0e56a6857b 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionViewModel.kt
@@ -36,7 +36,7 @@ enum class ConclusionState {
 }
 
 class VerificationConclusionViewModel(initialState: VerificationConclusionViewState) :
-    VectorViewModel<VerificationConclusionViewState, EmptyAction, EmptyViewEvents>(initialState) {
+        VectorViewModel<VerificationConclusionViewState, EmptyAction, EmptyViewEvents>(initialState) {
 
     companion object : MavericksViewModelFactory<VerificationConclusionViewModel, VerificationConclusionViewState> {
 
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt
index aec28f898e..95dd4263f9 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt
@@ -40,6 +40,7 @@ import org.matrix.android.sdk.api.session.crypto.verification.SasVerificationTra
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransaction
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
+import org.matrix.android.sdk.api.session.getUser
 import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
 
@@ -59,9 +60,13 @@ class VerificationEmojiCodeViewModel @AssistedInject constructor(
 
     init {
         withState { state ->
-            refreshStateFromTx(session.cryptoService().verificationService()
-                    .getExistingTransaction(state.otherUser?.id ?: "", state.transactionId
-                            ?: "") as? SasVerificationTransaction)
+            refreshStateFromTx(
+                    session.cryptoService().verificationService()
+                            .getExistingTransaction(
+                                    state.otherUser?.id ?: "", state.transactionId
+                                    ?: ""
+                            ) as? SasVerificationTransaction
+            )
         }
 
         session.cryptoService().verificationService().addListener(this)
diff --git a/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolEditFragment.kt b/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolEditFragment.kt
index dd0bd174af..1b6fbb7359 100644
--- a/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolEditFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolEditFragment.kt
@@ -32,7 +32,7 @@ import reactivecircus.flowbinding.android.widget.textChanges
 import javax.inject.Inject
 
 class RoomDevToolEditFragment @Inject constructor() :
-    VectorBaseFragment<FragmentDevtoolsEditorBinding>() {
+        VectorBaseFragment<FragmentDevtoolsEditorBinding>() {
 
     private val sharedViewModel: RoomDevToolViewModel by activityViewModel()
 
diff --git a/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolViewModel.kt b/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolViewModel.kt
index c13ef2f81c..fb78f8581a 100644
--- a/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/devtools/RoomDevToolViewModel.kt
@@ -36,6 +36,7 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.util.JsonDict
 import org.matrix.android.sdk.api.util.MatrixJsonParser
@@ -173,11 +174,10 @@ class RoomDevToolViewModel @AssistedInject constructor(
                 val json = adapter.fromJson(state.editedContent ?: "")
                         ?: throw IllegalArgumentException(stringProvider.getString(R.string.dev_tools_error_no_content))
 
-                room.sendStateEvent(
+                room.stateService().sendStateEvent(
                         state.selectedEvent?.type.orEmpty(),
                         state.selectedEvent?.stateKey.orEmpty(),
                         json
-
                 )
                 _viewEvents.post(DevToolsViewEvents.ShowSnackMessage(stringProvider.getString(R.string.dev_tools_success_state_event)))
                 setState {
@@ -211,7 +211,7 @@ class RoomDevToolViewModel @AssistedInject constructor(
                         ?: throw IllegalArgumentException(stringProvider.getString(R.string.dev_tools_error_no_message_type))
 
                 if (isState) {
-                    room.sendStateEvent(
+                    room.stateService().sendStateEvent(
                             eventType,
                             state.sendEventDraft.stateKey.orEmpty(),
                             json
@@ -221,7 +221,7 @@ class RoomDevToolViewModel @AssistedInject constructor(
                     // val validParse = MoshiProvider.providesMoshi().adapter(MessageContent::class.java).fromJson(it.sendEventDraft.content ?: "")
                     json.toModel<MessageContent>(catchError = false)
                             ?: throw IllegalArgumentException(stringProvider.getString(R.string.dev_tools_error_malformed_event))
-                    room.sendEvent(
+                    room.sendService().sendEvent(
                             eventType,
                             json
                     )
diff --git a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
index 2de03f296e..285d0f728f 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
@@ -117,7 +117,8 @@ class DiscoverySettingsFragment @Inject constructor(
                     termsActivityResultLauncher,
                     TermsService.ServiceType.IdentityService,
                     state.identityServer()?.serverUrl?.ensureProtocol() ?: "",
-                    null)
+                    null
+            )
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt
index 8c1caaf67a..47151223a4 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt
@@ -290,7 +290,7 @@ class DiscoverySettingsViewModel @AssistedInject constructor(
     }
 
     private fun retrieveBinding() {
-        retrieveBinding(session.getThreePids())
+        retrieveBinding(session.profileService().getThreePids())
     }
 
     private fun retrieveBinding(threePids: List<ThreePid>) = withState { state ->
diff --git a/vector/src/main/java/im/vector/app/features/discovery/Extensions.kt b/vector/src/main/java/im/vector/app/features/discovery/Extensions.kt
index 904b152661..dc25a35646 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/Extensions.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/Extensions.kt
@@ -24,7 +24,7 @@ import org.matrix.android.sdk.api.session.terms.TermsService
 suspend fun Session.fetchIdentityServerWithTerms(userLanguage: String): ServerAndPolicies? {
     return identityService().getCurrentIdentityServerUrl()
             ?.let { identityServerUrl ->
-                val termsResponse = getTerms(TermsService.ServiceType.IdentityService, identityServerUrl.ensureProtocol())
+                val termsResponse = termsService().getTerms(TermsService.ServiceType.IdentityService, identityServerUrl.ensureProtocol())
                         .serverResponse
                 buildServerAndPolicies(identityServerUrl, termsResponse, userLanguage)
             }
@@ -32,7 +32,7 @@ suspend fun Session.fetchIdentityServerWithTerms(userLanguage: String): ServerAn
 
 suspend fun Session.fetchHomeserverWithTerms(userLanguage: String): ServerAndPolicies {
     val homeserverUrl = sessionParams.homeServerUrl
-    val terms = getHomeserverTerms(homeserverUrl.ensureProtocol())
+    val terms = termsService().getHomeserverTerms(homeserverUrl.ensureProtocol())
     return buildServerAndPolicies(homeserverUrl, terms, userLanguage)
 }
 
diff --git a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt
index ca43e80ea6..fe2be713af 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt
@@ -67,8 +67,10 @@ class SetIdentityServerFragment @Inject constructor(
                     state.defaultIdentityServerUrl.toReducedUrl()
             )
                     .toSpannable()
-                    .colorizeMatchingText(state.defaultIdentityServerUrl.toReducedUrl(),
-                            colorProvider.getColorFromAttribute(R.attr.vctr_content_tertiary))
+                    .colorizeMatchingText(
+                            state.defaultIdentityServerUrl.toReducedUrl(),
+                            colorProvider.getColorFromAttribute(R.attr.vctr_content_tertiary)
+                    )
 
             views.identityServerSetDefaultNotice.isVisible = true
             views.identityServerSetDefaultSubmit.isVisible = true
@@ -129,7 +131,8 @@ class SetIdentityServerFragment @Inject constructor(
                             termsActivityResultLauncher,
                             TermsService.ServiceType.IdentityService,
                             it.identityServerUrl,
-                            null)
+                            null
+                    )
                 }
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt
index da01ba5662..ae1c7f7753 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt
@@ -39,7 +39,7 @@ class SetIdentityServerViewModel @AssistedInject constructor(
         @Assisted initialState: SetIdentityServerState,
         private val mxSession: Session,
         stringProvider: StringProvider) :
-    VectorViewModel<SetIdentityServerState, SetIdentityServerAction, SetIdentityServerViewEvents>(initialState) {
+        VectorViewModel<SetIdentityServerState, SetIdentityServerAction, SetIdentityServerViewEvents>(initialState) {
 
     @AssistedFactory
     interface Factory : MavericksAssistedViewModelFactory<SetIdentityServerViewModel, SetIdentityServerState> {
@@ -107,7 +107,7 @@ class SetIdentityServerViewModel @AssistedInject constructor(
 
     private suspend fun checkTerms(baseUrl: String) {
         try {
-            val data = mxSession.getTerms(TermsService.ServiceType.IdentityService, baseUrl)
+            val data = mxSession.termsService().getTerms(TermsService.ServiceType.IdentityService, baseUrl)
 
             // has all been accepted?
             val resp = data.serverResponse
diff --git a/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
index 326b350f30..fd2862f5f0 100644
--- a/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
@@ -66,9 +66,11 @@ class AvatarRenderer @Inject constructor(private val activeSessionHolder: Active
 
     @UiThread
     fun render(matrixItem: MatrixItem, imageView: ImageView) {
-        render(GlideApp.with(imageView),
+        render(
+                GlideApp.with(imageView),
                 matrixItem,
-                DrawableImageViewTarget(imageView))
+                DrawableImageViewTarget(imageView)
+        )
     }
 
 //    fun renderSpace(matrixItem: MatrixItem, imageView: ImageView) {
@@ -97,9 +99,11 @@ class AvatarRenderer @Inject constructor(private val activeSessionHolder: Active
 
     @UiThread
     fun render(matrixItem: MatrixItem, imageView: ImageView, glideRequests: GlideRequests) {
-        render(glideRequests,
+        render(
+                glideRequests,
                 matrixItem,
-                DrawableImageViewTarget(imageView))
+                DrawableImageViewTarget(imageView)
+        )
     }
 
     @UiThread
@@ -200,12 +204,14 @@ class AvatarRenderer @Inject constructor(private val activeSessionHolder: Active
                 it.load(resolvedUrl)
             } else {
                 val avatarColor = matrixItemColorProvider.getColor(matrixItem)
-                it.load(TextDrawable.builder()
-                        .beginConfig()
-                        .bold()
-                        .endConfig()
-                        .buildRect(matrixItem.firstLetterOfDisplayName(), avatarColor)
-                        .toBitmap(width = iconSize, height = iconSize))
+                it.load(
+                        TextDrawable.builder()
+                                .beginConfig()
+                                .bold()
+                                .endConfig()
+                                .buildRect(matrixItem.firstLetterOfDisplayName(), avatarColor)
+                                .toBitmap(width = iconSize, height = iconSize)
+                )
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index 7a8dcf2634..cc202868cc 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -49,8 +49,10 @@ import im.vector.app.features.MainActivity
 import im.vector.app.features.MainActivityArgs
 import im.vector.app.features.analytics.accountdata.AnalyticsAccountDataViewModel
 import im.vector.app.features.analytics.plan.MobileScreen
+import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.disclaimer.showDisclaimerDialog
 import im.vector.app.features.matrixto.MatrixToBottomSheet
+import im.vector.app.features.matrixto.OriginOfMatrixTo
 import im.vector.app.features.navigation.Navigator
 import im.vector.app.features.notifications.NotificationDrawerManager
 import im.vector.app.features.permalink.NavigationInterceptor
@@ -140,9 +142,11 @@ class HomeActivity :
             }
             // Here we want to change current space to the newly created one, and then immediately open the default room
             if (spaceId != null) {
-                navigator.switchToSpace(context = this,
+                navigator.switchToSpace(
+                        context = this,
                         spaceId = spaceId,
-                        postSwitchOption)
+                        postSwitchOption
+                )
             }
         }
     }
@@ -243,7 +247,7 @@ class HomeActivity :
         }
         if (args?.inviteNotificationRoomId != null) {
             activeSessionHolder.getSafeActiveSession()?.permalinkService()?.createPermalink(args.inviteNotificationRoomId)?.let {
-                navigator.openMatrixToBottomSheet(this, it)
+                navigator.openMatrixToBottomSheet(this, it, OriginOfMatrixTo.NOTIFICATION)
             }
         }
 
@@ -370,7 +374,7 @@ class HomeActivity :
                 }
                 views.waitingView.root.isVisible = true
             }
-            else                                    -> {
+            else                                               -> {
                 // Idle or Incremental sync status
                 views.waitingView.root.isVisible = false
             }
@@ -480,7 +484,7 @@ class HomeActivity :
             activeSessionHolder.getSafeActiveSession()
                     ?.permalinkService()
                     ?.createPermalink(parcelableExtra.inviteNotificationRoomId)?.let {
-                        navigator.openMatrixToBottomSheet(this, it)
+                        navigator.openMatrixToBottomSheet(this, it, OriginOfMatrixTo.NOTIFICATION)
                     }
         }
         handleIntent(intent)
@@ -567,14 +571,14 @@ class HomeActivity :
 
     override fun navToMemberProfile(userId: String, deepLink: Uri): Boolean {
         // TODO check if there is already one??
-        MatrixToBottomSheet.withLink(deepLink.toString())
+        MatrixToBottomSheet.withLink(deepLink.toString(), OriginOfMatrixTo.LINK)
                 .show(supportFragmentManager, "HA#MatrixToBottomSheet")
         return true
     }
 
     override fun navToRoom(roomId: String?, eventId: String?, deepLink: Uri?, rootThreadEventId: String?): Boolean {
         if (roomId == null) return false
-        MatrixToBottomSheet.withLink(deepLink.toString())
+        MatrixToBottomSheet.withLink(deepLink.toString(), OriginOfMatrixTo.LINK)
                 .show(supportFragmentManager, "HA#MatrixToBottomSheet")
         return true
     }
@@ -608,8 +612,8 @@ class HomeActivity :
         }
     }
 
-    override fun mxToBottomSheetNavigateToRoom(roomId: String) {
-        navigator.openRoom(this, roomId)
+    override fun mxToBottomSheetNavigateToRoom(roomId: String, trigger: ViewRoom.Trigger?) {
+        navigator.openRoom(this, roomId, trigger = trigger)
     }
 
     override fun mxToBottomSheetSwitchToSpace(spaceId: String) {
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
index c8b0fa024e..05973de49d 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
@@ -42,10 +42,11 @@ import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
 import org.matrix.android.sdk.api.auth.registration.nextUncompletedStage
 import org.matrix.android.sdk.api.extensions.tryOrNull
-import org.matrix.android.sdk.api.pushrules.RuleIds
 import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.api.session.crypto.model.MXUsersDevicesMap
+import org.matrix.android.sdk.api.session.getUser
 import org.matrix.android.sdk.api.session.initsync.SyncStatusService
+import org.matrix.android.sdk.api.session.pushrules.RuleIds
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.settings.LightweightSettingsStorage
@@ -175,7 +176,7 @@ class HomeActivityViewModel @AssistedInject constructor(
     private fun observeInitialSync() {
         val session = activeSessionHolder.getSafeActiveSession() ?: return
 
-        session.getSyncStatusLive()
+        session.syncStatusService().getSyncStatusLive()
                 .asFlow()
                 .onEach { status ->
                     when (status) {
@@ -189,7 +190,7 @@ class HomeActivityViewModel @AssistedInject constructor(
                                 maybeBootstrapCrossSigningAfterInitialSync()
                             }
                         }
-                        else                                    -> Unit
+                        else                                               -> Unit
                     }
 
                     setState {
@@ -215,15 +216,18 @@ class HomeActivityViewModel @AssistedInject constructor(
             if (!vectorPreferences.areNotificationEnabledForDevice()) {
                 // Check if set at account level
                 val mRuleMaster = activeSessionHolder.getSafeActiveSession()
+                        ?.pushRuleService()
                         ?.getPushRules()
                         ?.getAllRules()
                         ?.find { it.ruleId == RuleIds.RULE_ID_DISABLE_ALL }
                 if (mRuleMaster?.enabled == false) {
                     // So push are enabled at account level but not for this session
                     // Let's check that there are some rooms?
-                    val knownRooms = activeSessionHolder.getSafeActiveSession()?.getRoomSummaries(roomSummaryQueryParams {
-                        memberships = Membership.activeMemberships()
-                    })?.size ?: 0
+                    val knownRooms = activeSessionHolder.getSafeActiveSession()
+                            ?.roomService()
+                            ?.getRoomSummaries(roomSummaryQueryParams {
+                                memberships = Membership.activeMemberships()
+                            })?.size ?: 0
 
                     // Prompt once to the user
                     if (knownRooms > 1 && !vectorPreferences.didAskUserToEnableSessionPush()) {
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
index f3973e5d4c..2753ba817d 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
@@ -444,7 +444,8 @@ class HomeDetailFragment @Inject constructor(
                 it.syncState,
                 it.incrementalSyncStatus,
                 it.pushCounter,
-                vectorPreferences.developerShowDebugInfo())
+                vectorPreferences.developerShowDebugInfo()
+        )
 
         hasUnreadRooms = it.hasUnreadMessages
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index 2457dd0eaa..fc39165a7e 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -91,7 +91,7 @@ class HomeDetailViewModel @AssistedInject constructor(
 
     private val refreshRoomSummariesOnCryptoSessionChange = object : NewSessionListener {
         override fun onNewSession(roomId: String?, senderKey: String, sessionId: String) {
-            session.refreshJoinedRoomSummaryPreviews(roomId)
+            session.roomService().refreshJoinedRoomSummaryPreviews(roomId)
         }
     }
 
@@ -176,7 +176,7 @@ class HomeDetailViewModel @AssistedInject constructor(
     private fun handleMarkAllRoomsRead() = withState { _ ->
         // questionable to use viewmodelscope
         viewModelScope.launch(Dispatchers.Default) {
-            val roomIds = session.getRoomSummaries(
+            val roomIds = session.roomService().getRoomSummaries(
                     roomSummaryQueryParams {
                         memberships = listOf(Membership.JOIN)
                         roomCategoryFilter = RoomCategoryFilter.ONLY_WITH_NOTIFICATIONS
@@ -184,7 +184,7 @@ class HomeDetailViewModel @AssistedInject constructor(
             )
                     .map { it.roomId }
             try {
-                session.markAllAsRead(roomIds)
+                session.roomService().markAllAsRead(roomIds)
             } catch (failure: Throwable) {
                 Timber.d(failure, "Failed to mark all as read")
             }
@@ -198,7 +198,7 @@ class HomeDetailViewModel @AssistedInject constructor(
                     copy(syncState = syncState)
                 }
 
-        session.getSyncStatusLive()
+        session.syncStatusService().getSyncStatusLive()
                 .asFlow()
                 .filterIsInstance<SyncStatusService.Status.IncrementalSyncStatus>()
                 .setOnEach {
@@ -219,7 +219,7 @@ class HomeDetailViewModel @AssistedInject constructor(
         appStateHandler.selectedRoomGroupingFlow.distinctUntilChanged().flatMapLatest {
             // we use it as a trigger to all changes in room, but do not really load
             // the actual models
-            session.getPagedRoomSummariesLive(
+            session.roomService().getPagedRoomSummariesLive(
                     roomSummaryQueryParams {
                         memberships = Membership.activeMemberships()
                     },
@@ -237,7 +237,7 @@ class HomeDetailViewModel @AssistedInject constructor(
                             var dmInvites = 0
                             var roomsInvite = 0
                             if (autoAcceptInvites.showInvites()) {
-                                dmInvites = session.getRoomSummaries(
+                                dmInvites = session.roomService().getRoomSummaries(
                                         roomSummaryQueryParams {
                                             memberships = listOf(Membership.INVITE)
                                             roomCategoryFilter = RoomCategoryFilter.ONLY_DM
@@ -245,7 +245,7 @@ class HomeDetailViewModel @AssistedInject constructor(
                                         }
                                 ).size
 
-                                roomsInvite = session.getRoomSummaries(
+                                roomsInvite = session.roomService().getRoomSummaries(
                                         roomSummaryQueryParams {
                                             memberships = listOf(Membership.INVITE)
                                             roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
@@ -254,7 +254,7 @@ class HomeDetailViewModel @AssistedInject constructor(
                                 ).size
                             }
 
-                            val dmRooms = session.getNotificationCountForRooms(
+                            val dmRooms = session.roomService().getNotificationCountForRooms(
                                     roomSummaryQueryParams {
                                         memberships = listOf(Membership.JOIN)
                                         roomCategoryFilter = RoomCategoryFilter.ONLY_DM
@@ -262,7 +262,7 @@ class HomeDetailViewModel @AssistedInject constructor(
                                     }
                             )
 
-                            val otherRooms = session.getNotificationCountForRooms(
+                            val otherRooms = session.roomService().getNotificationCountForRooms(
                                     roomSummaryQueryParams {
                                         memberships = listOf(Membership.JOIN)
                                         roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
index 1aee0257f4..9ce950ba31 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
@@ -60,7 +60,7 @@ class HomeDrawerFragment @Inject constructor(
         if (savedInstanceState == null) {
             replaceChildFragment(R.id.homeDrawerGroupListContainer, SpaceListFragment::class.java)
         }
-        session.getUserLive(session.myUserId).observeK(viewLifecycleOwner) { optionalUser ->
+        session.userService().getUserLive(session.myUserId).observeK(viewLifecycleOwner) { optionalUser ->
             val user = optionalUser?.getOrNull()
             if (user != null) {
                 avatarRenderer.render(user.toMatrixItem(), views.homeDrawerHeaderAvatarView)
diff --git a/vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt
index 08b528f25a..34bdc5fcd3 100644
--- a/vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt
@@ -29,6 +29,7 @@ import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.platform.VectorViewModelAction
+import im.vector.app.core.time.Clock
 import im.vector.app.features.settings.VectorPreferences
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -39,6 +40,7 @@ import org.matrix.android.sdk.api.NoOpMatrixCallback
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+import org.matrix.android.sdk.api.session.getUser
 import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.flow.flow
@@ -55,10 +57,12 @@ data class DeviceDetectionInfo(
         val currentSessionTrust: Boolean
 )
 
-class UnknownDeviceDetectorSharedViewModel @AssistedInject constructor(@Assisted initialState: UnknownDevicesState,
-                                                                       session: Session,
-                                                                       private val vectorPreferences: VectorPreferences) :
-    VectorViewModel<UnknownDevicesState, UnknownDeviceDetectorSharedViewModel.Action, EmptyViewEvents>(initialState) {
+class UnknownDeviceDetectorSharedViewModel @AssistedInject constructor(
+        @Assisted initialState: UnknownDevicesState,
+        session: Session,
+        private val vectorPreferences: VectorPreferences,
+        clock: Clock,
+) : VectorViewModel<UnknownDevicesState, UnknownDeviceDetectorSharedViewModel.Action, EmptyViewEvents>(initialState) {
 
     sealed class Action : VectorViewModelAction {
         data class IgnoreDevice(val deviceIds: List<String>) : Action()
@@ -74,11 +78,10 @@ class UnknownDeviceDetectorSharedViewModel @AssistedInject constructor(@Assisted
     private val ignoredDeviceList = ArrayList<String>()
 
     init {
-
         val currentSessionTs = session.cryptoService().getCryptoDeviceInfo(session.myUserId)
                 .firstOrNull { it.deviceId == session.sessionParams.deviceId }
                 ?.firstTimeSeenLocalTs
-                ?: System.currentTimeMillis()
+                ?: clock.epochMillis()
         Timber.v("## Detector - Current Session first time seen $currentSessionTs")
 
         ignoredDeviceList.addAll(
diff --git a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
index 409eb0b845..c1b3937fee 100644
--- a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
@@ -71,9 +71,11 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
 
     override fun handle(action: EmptyAction) {}
 
+    private val roomService = session.roomService()
+
     init {
 
-        session.getPagedRoomSummariesLive(
+        roomService.getPagedRoomSummariesLive(
                 roomSummaryQueryParams {
                     this.memberships = listOf(Membership.JOIN)
                     this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null)
@@ -81,7 +83,7 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
         ).asFlow()
                 .throttleFirst(300)
                 .execute {
-                    val counts = session.getNotificationCountForRooms(
+                    val counts = roomService.getNotificationCountForRooms(
                             roomSummaryQueryParams {
                                 this.memberships = listOf(Membership.JOIN)
                                 this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null)
@@ -90,7 +92,7 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
                     val invites = if (autoAcceptInvites.hideInvites) {
                         0
                     } else {
-                        session.getRoomSummaries(
+                        roomService.getRoomSummaries(
                                 roomSummaryQueryParams {
                                     this.memberships = listOf(Membership.INVITE)
                                     this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null)
@@ -109,7 +111,7 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
         combine(
                 appStateHandler.selectedRoomGroupingFlow.distinctUntilChanged(),
                 appStateHandler.selectedRoomGroupingFlow.flatMapLatest {
-                    session.getPagedRoomSummariesLive(
+                    roomService.getPagedRoomSummariesLive(
                             roomSummaryQueryParams {
                                 this.memberships = Membership.activeMemberships()
                             }, sortOrder = RoomSortOrder.NONE
@@ -131,7 +133,7 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
                     val inviteCount = if (autoAcceptInvites.hideInvites) {
                         0
                     } else {
-                        session.getRoomSummaries(
+                        roomService.getRoomSummaries(
                                 roomSummaryQueryParams { this.memberships = listOf(Membership.INVITE) }
                         ).size
                     }
@@ -139,14 +141,14 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
                     val spaceInviteCount = if (autoAcceptInvites.hideInvites) {
                         0
                     } else {
-                        session.getRoomSummaries(
+                        roomService.getRoomSummaries(
                                 spaceSummaryQueryParams {
                                     this.memberships = listOf(Membership.INVITE)
                                 }
                         ).size
                     }
 
-                    val totalCount = session.getNotificationCountForRooms(
+                    val totalCount = roomService.getNotificationCountForRooms(
                             roomSummaryQueryParams {
                                 this.memberships = listOf(Membership.JOIN)
                                 this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null).takeIf {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/ChatEffectManager.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/ChatEffectManager.kt
index f95baae36b..fa19e39ae7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/ChatEffectManager.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/ChatEffectManager.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.home.room.detail
 
+import im.vector.app.core.time.Clock
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageType
@@ -45,7 +46,9 @@ fun ChatEffect.toMessageType(): String {
  * precisely an event decrypted with a few delay won't trigger an effect; it's acceptable)
  * Events that are more that 10s old won't trigger effects
  */
-class ChatEffectManager @Inject constructor() {
+class ChatEffectManager @Inject constructor(
+        private val clock: Clock,
+) {
 
     interface Delegate {
         fun stopEffects()
@@ -61,7 +64,7 @@ class ChatEffectManager @Inject constructor() {
 
     fun checkForEffect(event: TimelineEvent) {
         val age = event.root.ageLocalTs ?: 0
-        val now = System.currentTimeMillis()
+        val now = clock.epochMillis()
         // messages older than 10s should not trigger any effect
         if ((now - age) >= 10_000) return
         val content = event.root.getClearContent()?.toModel<MessageContent>() ?: return
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/JoinReplacementRoomBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/JoinReplacementRoomBottomSheet.kt
index 99843084ec..ce2903a6fa 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/JoinReplacementRoomBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/JoinReplacementRoomBottomSheet.kt
@@ -62,15 +62,15 @@ class JoinReplacementRoomBottomSheet :
             when (joinState) {
                 // it should never be Uninitialized
                 Uninitialized,
-                is Loading    -> {
+                is Loading -> {
                     views.roomUpgradeButton.render(ButtonStateView.State.Loading)
                     views.descriptionText.setText(R.string.it_may_take_some_time)
                 }
-                is Success    -> {
+                is Success -> {
                     views.roomUpgradeButton.render(ButtonStateView.State.Loaded)
                     dismiss()
                 }
-                is Fail       -> {
+                is Fail    -> {
                     // display the error message
                     views.descriptionText.text = errorFormatter.toHumanReadable(joinState.error)
                     views.roomUpgradeButton.render(ButtonStateView.State.Error)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
index 5784e6e264..ac4df411a8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
@@ -36,6 +36,7 @@ import im.vector.app.core.extensions.replaceFragment
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityRoomDetailBinding
 import im.vector.app.features.analytics.plan.MobileScreen
+import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.home.room.breadcrumbs.BreadcrumbsFragment
 import im.vector.app.features.home.room.detail.arguments.TimelineArgs
 import im.vector.app.features.home.room.detail.timeline.helper.AudioMessagePlaybackTracker
@@ -205,8 +206,8 @@ class RoomDetailActivity :
         }
     }
 
-    override fun mxToBottomSheetNavigateToRoom(roomId: String) {
-        navigator.openRoom(this, roomId)
+    override fun mxToBottomSheetNavigateToRoom(roomId: String, trigger: ViewRoom.Trigger?) {
+        navigator.openRoom(this, roomId, trigger = trigger)
     }
 
     override fun mxToBottomSheetSwitchToSpace(spaceId: String) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
index 0c56d7e7eb..e01c5ba3b7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
@@ -87,7 +87,12 @@ data class RoomDetailViewState(
             rootThreadEventId = args.threadTimelineArgs?.rootThreadEventId
     )
 
-    fun isCallOptionAvailable() = asyncRoomSummary.invoke()?.isDirect ?: true
+    fun isCallOptionAvailable(): Boolean {
+        return asyncRoomSummary.invoke()?.isDirect ?: true ||
+                // When there is only one member, a warning will be displayed when the user
+                // clicks on the menu item to start a call
+                asyncRoomSummary.invoke()?.joinedMembersCount == 1
+    }
 
     fun isSearchAvailable() = asyncRoomSummary()?.isEncrypted == false
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt
index 9f10805f95..1f1124b8c0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt
@@ -33,14 +33,18 @@ import com.airbnb.epoxy.EpoxyModel
 import com.airbnb.epoxy.EpoxyTouchHelperCallback
 import com.airbnb.epoxy.EpoxyViewHolder
 import im.vector.app.R
+import im.vector.app.core.time.Clock
 import im.vector.app.features.themes.ThemeUtils
 import timber.log.Timber
 import kotlin.math.abs
 import kotlin.math.min
 
-class RoomMessageTouchHelperCallback(private val context: Context,
-                                     @DrawableRes actionIcon: Int,
-                                     private val handler: QuickReplayHandler) : EpoxyTouchHelperCallback() {
+class RoomMessageTouchHelperCallback(
+        private val context: Context,
+        @DrawableRes actionIcon: Int,
+        private val handler: QuickReplayHandler,
+        private val clock: Clock,
+) : EpoxyTouchHelperCallback() {
 
     interface QuickReplayHandler {
         fun performQuickReplyOnHolder(model: EpoxyModel<*>)
@@ -141,7 +145,7 @@ class RoomMessageTouchHelperCallback(private val context: Context,
     private fun drawReplyButton(canvas: Canvas, itemView: View) {
         // Timber.v("drawReplyButton")
         val translationX = abs(itemView.translationX)
-        val newTime = System.currentTimeMillis()
+        val newTime = clock.epochMillis()
         val dt = min(17, newTime - lastReplyButtonAnimationTime)
         lastReplyButtonAnimationTime = newTime
         val showing = translationX >= minShowDistance
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt
index 193dc42f33..d75b9ff69d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/StartCallActionsHandler.kt
@@ -63,12 +63,14 @@ class StartCallActionsHandler(
                 if (currentCall?.signalingRoomId == roomId) {
                     onTapToReturnToCall()
                 } else if (!state.isAllowedToStartWebRTCCall) {
-                    showDialogWithMessage(fragment.getString(
-                            if (state.isDm()) {
-                                R.string.no_permissions_to_start_webrtc_call_in_direct_room
-                            } else {
-                                R.string.no_permissions_to_start_webrtc_call
-                            })
+                    showDialogWithMessage(
+                            fragment.getString(
+                                    if (state.isDm()) {
+                                        R.string.no_permissions_to_start_webrtc_call_in_direct_room
+                                    } else {
+                                        R.string.no_permissions_to_start_webrtc_call
+                                    }
+                            )
                     )
                 } else {
                     safeStartCall(isVideoCall)
@@ -79,13 +81,15 @@ class StartCallActionsHandler(
                 // can you add widgets??
                 if (!state.isAllowedToManageWidgets) {
                     // You do not have permission to start a conference call in this room
-                    showDialogWithMessage(fragment.getString(
-                            if (state.isDm()) {
-                                R.string.no_permissions_to_start_conf_call_in_direct_room
-                            } else {
-                                R.string.no_permissions_to_start_conf_call
-                            }
-                    ))
+                    showDialogWithMessage(
+                            fragment.getString(
+                                    if (state.isDm()) {
+                                        R.string.no_permissions_to_start_conf_call_in_direct_room
+                                    } else {
+                                        R.string.no_permissions_to_start_conf_call
+                                    }
+                            )
+                    )
                 } else {
                     if (state.hasActiveJitsiWidget()) {
                         // A conference is already in progress, return
@@ -123,18 +127,22 @@ class StartCallActionsHandler(
         val startCallAction = RoomDetailAction.StartCall(isVideoCall)
         timelineViewModel.pendingAction = startCallAction
         if (isVideoCall) {
-            if (checkPermissions(PERMISSIONS_FOR_VIDEO_IP_CALL,
+            if (checkPermissions(
+                            PERMISSIONS_FOR_VIDEO_IP_CALL,
                             fragment.requireActivity(),
                             startCallActivityResultLauncher,
-                            R.string.permissions_rationale_msg_camera_and_audio)) {
+                            R.string.permissions_rationale_msg_camera_and_audio
+                    )) {
                 timelineViewModel.pendingAction = null
                 timelineViewModel.handle(startCallAction)
             }
         } else {
-            if (checkPermissions(PERMISSIONS_FOR_AUDIO_IP_CALL,
+            if (checkPermissions(
+                            PERMISSIONS_FOR_AUDIO_IP_CALL,
                             fragment.requireActivity(),
                             startCallActivityResultLauncher,
-                            R.string.permissions_rationale_msg_record_audio)) {
+                            R.string.permissions_rationale_msg_record_audio
+                    )) {
                 timelineViewModel.pendingAction = null
                 timelineViewModel.handle(startCallAction)
             }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
index 32f0e46eac..de1d512c75 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
@@ -105,6 +105,7 @@ import im.vector.app.core.utils.colorizeMatchingText
 import im.vector.app.core.utils.copyToClipboard
 import im.vector.app.core.utils.createJSonViewerStyleProvider
 import im.vector.app.core.utils.createUIHandler
+import im.vector.app.core.utils.isAnimationEnabled
 import im.vector.app.core.utils.isValidUrl
 import im.vector.app.core.utils.onPermissionDeniedDialog
 import im.vector.app.core.utils.onPermissionDeniedSnackbar
@@ -119,8 +120,6 @@ import im.vector.app.core.utils.startInstallFromSourceIntent
 import im.vector.app.core.utils.toast
 import im.vector.app.databinding.DialogReportContentBinding
 import im.vector.app.databinding.FragmentTimelineBinding
-import im.vector.app.features.MainActivity
-import im.vector.app.features.MainActivityArgs
 import im.vector.app.features.analytics.extensions.toAnalyticsInteraction
 import im.vector.app.features.analytics.plan.Interaction
 import im.vector.app.features.analytics.plan.MobileScreen
@@ -298,7 +297,7 @@ class TimelineFragment @Inject constructor(
         private const val ircPattern = " (IRC)"
     }
 
-    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider)
+    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider, clock)
 
     private val timelineArgs: TimelineArgs by args()
     private val glideRequests by lazy {
@@ -588,6 +587,10 @@ class TimelineFragment @Inject constructor(
     }
 
     private fun handleChatEffect(chatEffect: ChatEffect) {
+        if (!requireContext().isAnimationEnabled()) {
+            Timber.d("Do not perform chat effect, animations are disabled.")
+            return
+        }
         when (chatEffect) {
             ChatEffect.CONFETTI -> {
                 views.viewKonfetti.isVisible = true
@@ -668,11 +671,13 @@ class TimelineFragment @Inject constructor(
             ).apply {
                 directListener = { granted ->
                     if (granted) {
-                        timelineViewModel.handle(RoomDetailAction.EnsureNativeWidgetAllowed(
-                                widget = it.widget,
-                                userJustAccepted = true,
-                                grantedEvents = it.grantedEvents
-                        ))
+                        timelineViewModel.handle(
+                                RoomDetailAction.EnsureNativeWidgetAllowed(
+                                        widget = it.widget,
+                                        userJustAccepted = true,
+                                        grantedEvents = it.grantedEvents
+                                )
+                        )
                     }
                 }
             }
@@ -793,25 +798,29 @@ class TimelineFragment @Inject constructor(
 
             override fun onSendVoiceMessage() {
                 messageComposerViewModel.handle(
-                        MessageComposerAction.EndRecordingVoiceMessage(isCancelled = false, rootThreadEventId = getRootThreadEventId()))
+                        MessageComposerAction.EndRecordingVoiceMessage(isCancelled = false, rootThreadEventId = getRootThreadEventId())
+                )
                 updateRecordingUiState(RecordingUiState.Idle)
             }
 
             override fun onDeleteVoiceMessage() {
                 messageComposerViewModel.handle(
-                        MessageComposerAction.EndRecordingVoiceMessage(isCancelled = true, rootThreadEventId = getRootThreadEventId()))
+                        MessageComposerAction.EndRecordingVoiceMessage(isCancelled = true, rootThreadEventId = getRootThreadEventId())
+                )
                 updateRecordingUiState(RecordingUiState.Idle)
             }
 
             override fun onRecordingLimitReached() {
                 messageComposerViewModel.handle(
-                        MessageComposerAction.PauseRecordingVoiceMessage)
+                        MessageComposerAction.PauseRecordingVoiceMessage
+                )
                 updateRecordingUiState(RecordingUiState.Draft)
             }
 
             override fun onRecordingWaveformClicked() {
                 messageComposerViewModel.handle(
-                        MessageComposerAction.PauseRecordingVoiceMessage)
+                        MessageComposerAction.PauseRecordingVoiceMessage
+                )
                 updateRecordingUiState(RecordingUiState.Draft)
             }
 
@@ -829,7 +838,8 @@ class TimelineFragment @Inject constructor(
 
             private fun updateRecordingUiState(state: RecordingUiState) {
                 messageComposerViewModel.handle(
-                        MessageComposerAction.OnVoiceRecordingUiStateChanged(state))
+                        MessageComposerAction.OnVoiceRecordingUiStateChanged(state)
+                )
             }
         }
     }
@@ -1445,7 +1455,7 @@ class TimelineFragment @Inject constructor(
                     }
                 }
             }
-            val swipeCallback = RoomMessageTouchHelperCallback(requireContext(), R.drawable.ic_reply, quickReplyHandler)
+            val swipeCallback = RoomMessageTouchHelperCallback(requireContext(), R.drawable.ic_reply, quickReplyHandler, clock)
             val touchHelper = ItemTouchHelper(swipeCallback)
             touchHelper.attachToRecyclerView(views.timelineRecyclerView)
         }
@@ -1529,9 +1539,11 @@ class TimelineFragment @Inject constructor(
                     attachmentTypeSelector = AttachmentTypeSelectorView(vectorBaseActivity, vectorBaseActivity.layoutInflater, this@TimelineFragment)
                     attachmentTypeSelector.setAttachmentVisibility(
                             AttachmentTypeSelectorView.Type.LOCATION,
-                            vectorPreferences.isLocationSharingEnabled())
+                            vectorPreferences.isLocationSharingEnabled()
+                    )
                     attachmentTypeSelector.setAttachmentVisibility(
-                            AttachmentTypeSelectorView.Type.POLL, !isThreadTimeLine())
+                            AttachmentTypeSelectorView.Type.POLL, !isThreadTimeLine()
+                    )
                 }
                 attachmentTypeSelector.show(views.composerLayout.views.attachmentButton)
             }
@@ -1730,14 +1742,10 @@ class TimelineFragment @Inject constructor(
         dismissLoadingDialog()
         views.composerLayout.setTextIfDifferent("")
         when (parsedCommand) {
-            is ParsedCommand.SetMarkdown  -> {
+            is ParsedCommand.SetMarkdown -> {
                 showSnackWithMessage(getString(if (parsedCommand.enable) R.string.markdown_has_been_enabled else R.string.markdown_has_been_disabled))
             }
-            is ParsedCommand.UnignoreUser -> {
-                // A user has been un-ignored, perform a initial sync
-                MainActivity.restartApp(requireActivity(), MainActivityArgs(clearCache = true))
-            }
-            else                          -> Unit
+            else                         -> Unit
         }
     }
 
@@ -2192,7 +2200,8 @@ class TimelineFragment @Inject constructor(
                         file = it,
                         title = action.messageContent.body,
                         mediaMimeType = action.messageContent.mimeType ?: getMimeTypeFromUri(requireContext(), it.toUri()),
-                        notificationUtils = notificationUtils
+                        notificationUtils = notificationUtils,
+                        currentTimeMillis = clock.epochMillis()
                 )
             }
                     .onFailure {
@@ -2297,12 +2306,18 @@ class TimelineFragment @Inject constructor(
                 handleCancelSend(action)
             }
             is EventSharedAction.ReportContentSpam          -> {
-                timelineViewModel.handle(RoomDetailAction.ReportContent(
-                        action.eventId, action.senderId, "This message is spam", spam = true))
+                timelineViewModel.handle(
+                        RoomDetailAction.ReportContent(
+                                action.eventId, action.senderId, "This message is spam", spam = true
+                        )
+                )
             }
             is EventSharedAction.ReportContentInappropriate -> {
-                timelineViewModel.handle(RoomDetailAction.ReportContent(
-                        action.eventId, action.senderId, "This message is inappropriate", inappropriate = true))
+                timelineViewModel.handle(
+                        RoomDetailAction.ReportContent(
+                                action.eventId, action.senderId, "This message is inappropriate", inappropriate = true
+                        )
+                )
             }
             is EventSharedAction.ReportContentCustom        -> {
                 promptReasonToReportContent(action)
@@ -2448,7 +2463,8 @@ class TimelineFragment @Inject constructor(
                     displayName = timelineViewModel.getRoomSummary()?.displayName,
                     avatarUrl = timelineViewModel.getRoomSummary()?.avatarUrl,
                     roomEncryptionTrustLevel = timelineViewModel.getRoomSummary()?.roomEncryptionTrustLevel,
-                    rootThreadEventId = rootThreadEventId)
+                    rootThreadEventId = rootThreadEventId
+            )
             navigator.openThread(it, roomThreadDetailArgs)
         }
     }
@@ -2484,7 +2500,8 @@ class TimelineFragment @Inject constructor(
                     roomId = timelineArgs.roomId,
                     displayName = timelineViewModel.getRoomSummary()?.displayName,
                     roomEncryptionTrustLevel = timelineViewModel.getRoomSummary()?.roomEncryptionTrustLevel,
-                    avatarUrl = timelineViewModel.getRoomSummary()?.avatarUrl)
+                    avatarUrl = timelineViewModel.getRoomSummary()?.avatarUrl
+            )
             navigator.openThreadList(it, roomThreadDetailArgs)
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
index b79b55b248..fc31c72df3 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
@@ -40,6 +40,7 @@ import im.vector.app.core.utils.BehaviorDataSource
 import im.vector.app.features.analytics.AnalyticsTracker
 import im.vector.app.features.analytics.DecryptionFailureTracker
 import im.vector.app.features.analytics.extensions.toAnalyticsJoinedRoom
+import im.vector.app.features.analytics.plan.JoinedRoom
 import im.vector.app.features.call.conference.ConferenceEvent
 import im.vector.app.features.call.conference.JitsiActiveConferenceHolder
 import im.vector.app.features.call.conference.JitsiService
@@ -86,7 +87,10 @@ import org.matrix.android.sdk.api.session.events.model.isTextMessage
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.file.FileService
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.initsync.SyncStatusService
+import org.matrix.android.sdk.api.session.room.getStateEvent
+import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.members.roomMemberQueryParams
 import org.matrix.android.sdk.api.session.room.model.Membership
@@ -181,18 +185,18 @@ class TimelineViewModel @AssistedInject constructor(
         setupPreviewUrlObservers()
         room.getRoomSummaryLive()
         viewModelScope.launch(Dispatchers.IO) {
-            tryOrNull { room.markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT) }
+            tryOrNull { room.readService().markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT) }
         }
         // Inform the SDK that the room is displayed
         viewModelScope.launch(Dispatchers.IO) {
-            tryOrNull { session.onRoomDisplayed(initialState.roomId) }
+            tryOrNull { session.roomService().onRoomDisplayed(initialState.roomId) }
         }
         callManager.addProtocolsCheckerListener(this)
         callManager.checkForProtocolsSupportIfNeeded()
         chatEffectManager.delegate = this
 
         // Ensure to share the outbound session keys with all members
-        if (OutboundSessionKeySharingStrategy.WhenEnteringRoom == BuildConfig.outboundSessionKeySharingStrategy && room.isEncrypted()) {
+        if (OutboundSessionKeySharingStrategy.WhenEnteringRoom == BuildConfig.outboundSessionKeySharingStrategy && room.roomCryptoService().isEncrypted()) {
             prepareForEncryption()
         }
 
@@ -214,7 +218,8 @@ class TimelineViewModel @AssistedInject constructor(
                                     .flattenParentIds.firstOrNull { it.isNotBlank() },
                             // force persist, because if not on resume the AppStateHandler will resume
                             // the current space from what was persisted on enter background
-                            persistNow = true)
+                            persistNow = true
+                    )
                 }
             }
         }
@@ -248,7 +253,7 @@ class TimelineViewModel @AssistedInject constructor(
             prepareToEncrypt = Loading()
             viewModelScope.launch {
                 runCatching {
-                    room.prepareToEncrypt()
+                    room.roomCryptoService().prepareToEncrypt()
                 }.fold({
                     prepareToEncrypt = Success(Unit)
                 }, {
@@ -352,7 +357,7 @@ class TimelineViewModel @AssistedInject constructor(
     private fun markThreadTimelineAsReadLocal() {
         initialState.rootThreadEventId?.let {
             session.coroutineScope.launch {
-                room.markThreadAsRead(it)
+                room.threadsLocalService().markThreadAsRead(it)
             }
         }
     }
@@ -369,9 +374,12 @@ class TimelineViewModel @AssistedInject constructor(
                         threadRootEvent.root.threadDetails?.threadNotificationState == ThreadNotificationState.NEW_HIGHLIGHTED_MESSAGE
                     }?.let { true } ?: false
                     val numberOfLocalUnreadThreads = threadList?.size ?: 0
-                    copy(threadNotificationBadgeState = ThreadNotificationBadgeState(
-                            numberOfLocalUnreadThreads = numberOfLocalUnreadThreads,
-                            isUserMentioned = isUserMentioned))
+                    copy(
+                            threadNotificationBadgeState = ThreadNotificationBadgeState(
+                                    numberOfLocalUnreadThreads = numberOfLocalUnreadThreads,
+                                    isUserMentioned = isUserMentioned
+                            )
+                    )
                 }
     }
 
@@ -488,7 +496,7 @@ class TimelineViewModel @AssistedInject constructor(
     private fun handleSetNewAvatar(action: RoomDetailAction.SetAvatarAction) {
         viewModelScope.launch(Dispatchers.IO) {
             try {
-                room.updateAvatar(action.newAvatarUri, action.newAvatarFileName)
+                room.stateService().updateAvatar(action.newAvatarUri, action.newAvatarFileName)
                 _viewEvents.post(RoomDetailViewEvents.ActionSuccess(action))
             } catch (failure: Throwable) {
                 _viewEvents.post(RoomDetailViewEvents.ActionFailure(action, failure))
@@ -505,19 +513,22 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     private fun handleJumpToReadReceipt(action: RoomDetailAction.JumpToReadReceipt) {
-        room.getUserReadReceipt(action.userId)
+        room.readService().getUserReadReceipt(action.userId)
                 ?.let { handleNavigateToEvent(RoomDetailAction.NavigateToEvent(it, true)) }
     }
 
     private fun handleSendSticker(action: RoomDetailAction.SendSticker) {
         val content = initialState.rootThreadEventId?.let {
-            action.stickerContent.copy(relatesTo = RelationDefaultContent(
-                    type = RelationType.THREAD,
-                    isFallingBack = true,
-                    eventId = it))
+            action.stickerContent.copy(
+                    relatesTo = RelationDefaultContent(
+                            type = RelationType.THREAD,
+                            isFallingBack = true,
+                            eventId = it
+                    )
+            )
         } ?: action.stickerContent
 
-        room.sendEvent(EventType.STICKER, content.toContent())
+        room.sendService().sendEvent(EventType.STICKER, content.toContent())
     }
 
     private fun handleStartCall(action: RoomDetailAction.StartCall) {
@@ -637,7 +648,7 @@ class TimelineViewModel @AssistedInject constructor(
         if (trackUnreadMessages.getAndSet(false)) {
             mostRecentDisplayedEvent?.root?.eventId?.also {
                 session.coroutineScope.launch {
-                    tryOrNull { room.setReadMarker(it) }
+                    tryOrNull { room.readService().setReadMarker(it) }
                 }
             }
             mostRecentDisplayedEvent = null
@@ -650,12 +661,12 @@ class TimelineViewModel @AssistedInject constructor(
     }
 
     fun getMember(userId: String): RoomMemberSummary? {
-        return room.getRoomMember(userId)
+        return room.membershipService().getRoomMember(userId)
     }
 
     private fun handleComposerFocusChange(action: RoomDetailAction.ComposerFocusChange) {
         // Ensure outbound session keys
-        if (OutboundSessionKeySharingStrategy.WhenTyping == BuildConfig.outboundSessionKeySharingStrategy && room.isEncrypted()) {
+        if (OutboundSessionKeySharingStrategy.WhenTyping == BuildConfig.outboundSessionKeySharingStrategy && room.roomCryptoService().isEncrypted()) {
             if (action.focused) {
                 // Should we add some rate limit here, or do it only once per model lifecycle?
                 prepareForEncryption()
@@ -682,7 +693,7 @@ class TimelineViewModel @AssistedInject constructor(
             }
             viewModelScope.launch {
                 val result = runCatchingToAsync {
-                    session.joinRoom(roomId, viaServers = viaServers)
+                    session.roomService().joinRoom(roomId, viaServers = viaServers)
                     roomId
                 }
                 setState {
@@ -736,36 +747,36 @@ class TimelineViewModel @AssistedInject constructor(
     // PRIVATE METHODS *****************************************************************************
 
     private fun handleSendReaction(action: RoomDetailAction.SendReaction) {
-        room.sendReaction(action.targetEventId, action.reaction)
+        room.relationService().sendReaction(action.targetEventId, action.reaction)
     }
 
     private fun handleRedactEvent(action: RoomDetailAction.RedactAction) {
         val event = room.getTimelineEvent(action.targetEventId) ?: return
-        room.redactEvent(event.root, action.reason)
+        room.sendService().redactEvent(event.root, action.reason)
     }
 
     private fun handleUndoReact(action: RoomDetailAction.UndoReaction) {
         viewModelScope.launch {
             tryOrNull {
-                room.undoReaction(action.targetEventId, action.reaction)
+                room.relationService().undoReaction(action.targetEventId, action.reaction)
             }
         }
     }
 
     private fun handleUpdateQuickReaction(action: RoomDetailAction.UpdateQuickReactAction) {
         if (action.add) {
-            room.sendReaction(action.targetEventId, action.selectedReaction)
+            room.relationService().sendReaction(action.targetEventId, action.selectedReaction)
         } else {
             viewModelScope.launch {
                 tryOrNull {
-                    room.undoReaction(action.targetEventId, action.selectedReaction)
+                    room.relationService().undoReaction(action.targetEventId, action.selectedReaction)
                 }
             }
         }
     }
 
     private fun handleSendMedia(action: RoomDetailAction.SendMedia) {
-        room.sendMedias(
+        room.sendService().sendMedias(
                 action.attachments,
                 action.compressBeforeSending,
                 emptySet(),
@@ -808,7 +819,7 @@ class TimelineViewModel @AssistedInject constructor(
         notificationDrawerManager.updateEvents { it.clearMemberShipNotificationForRoom(initialState.roomId) }
         viewModelScope.launch {
             try {
-                session.leaveRoom(room.roomId)
+                session.roomService().leaveRoom(room.roomId)
             } catch (throwable: Throwable) {
                 _viewEvents.post(RoomDetailViewEvents.Failure(throwable, showInDialog = true))
             }
@@ -819,24 +830,35 @@ class TimelineViewModel @AssistedInject constructor(
         notificationDrawerManager.updateEvents { it.clearMemberShipNotificationForRoom(initialState.roomId) }
         viewModelScope.launch {
             try {
-                session.joinRoom(room.roomId)
-                analyticsTracker.capture(room.roomSummary().toAnalyticsJoinedRoom())
+                session.roomService().joinRoom(room.roomId)
+                trackRoomJoined()
             } catch (throwable: Throwable) {
                 _viewEvents.post(RoomDetailViewEvents.Failure(throwable, showInDialog = true))
             }
         }
     }
 
+    private fun trackRoomJoined() {
+        val trigger = if (initialState.isInviteAlreadyAccepted) {
+            JoinedRoom.Trigger.Invite
+        } else {
+            JoinedRoom.Trigger.Timeline
+        }
+        analyticsTracker.capture(room.roomSummary().toAnalyticsJoinedRoom(trigger))
+    }
+
     private fun handleOpenOrDownloadFile(action: RoomDetailAction.DownloadOrOpen) {
         val mxcUrl = action.messageFileContent.getFileUrl() ?: return
         val isLocalSendingFile = action.senderId == session.myUserId &&
                 mxcUrl.startsWith("content://")
         if (isLocalSendingFile) {
             tryOrNull { Uri.parse(mxcUrl) }?.let {
-                _viewEvents.post(RoomDetailViewEvents.OpenFile(
-                        it,
-                        action.messageFileContent.mimeType
-                ))
+                _viewEvents.post(
+                        RoomDetailViewEvents.OpenFile(
+                                it,
+                                action.messageFileContent.mimeType
+                        )
+                )
             }
         } else {
             viewModelScope.launch {
@@ -848,21 +870,25 @@ class TimelineViewModel @AssistedInject constructor(
                         session.fileService().downloadFile(messageContent = action.messageFileContent)
                     }
 
-                    _viewEvents.post(RoomDetailViewEvents.DownloadFileState(
-                            action.messageFileContent.mimeType,
-                            result.getOrNull(),
-                            result.exceptionOrNull()
-                    ))
+                    _viewEvents.post(
+                            RoomDetailViewEvents.DownloadFileState(
+                                    action.messageFileContent.mimeType,
+                                    result.getOrNull(),
+                                    result.exceptionOrNull()
+                            )
+                    )
                     canOpen = result.isSuccess
                 }
 
                 if (canOpen) {
                     // We can now open the file
                     session.fileService().getTemporarySharableURI(action.messageFileContent)?.let { uri ->
-                        _viewEvents.post(RoomDetailViewEvents.OpenFile(
-                                uri,
-                                action.messageFileContent.mimeType
-                        ))
+                        _viewEvents.post(
+                                RoomDetailViewEvents.OpenFile(
+                                        uri,
+                                        action.messageFileContent.mimeType
+                                )
+                        )
                     }
                 }
             }
@@ -891,8 +917,8 @@ class TimelineViewModel @AssistedInject constructor(
                 return
             }
             when {
-                it.root.isTextMessage()       -> room.resendTextMessage(it)
-                it.root.isAttachmentMessage() -> room.resendMediaMessage(it)
+                it.root.isTextMessage()       -> room.sendService().resendTextMessage(it)
+                it.root.isAttachmentMessage() -> room.sendService().resendMediaMessage(it)
                 else                          -> {
                     // TODO
                 }
@@ -908,13 +934,13 @@ class TimelineViewModel @AssistedInject constructor(
                 Timber.e("Cannot resend message, it is not failed, Cancel first")
                 return
             }
-            room.deleteFailedEcho(it)
+            room.sendService().deleteFailedEcho(it)
         }
     }
 
     private fun handleCancel(action: RoomDetailAction.CancelSend) {
         if (action.force) {
-            room.cancelSend(action.eventId)
+            room.sendService().cancelSend(action.eventId)
             return
         }
         val targetEventId = action.eventId
@@ -924,16 +950,16 @@ class TimelineViewModel @AssistedInject constructor(
                 Timber.e("Cannot cancel message, it is not sending")
                 return
             }
-            room.cancelSend(targetEventId)
+            room.sendService().cancelSend(targetEventId)
         }
     }
 
     private fun handleResendAll() {
-        room.resendAllFailedMessages()
+        room.sendService().resendAllFailedMessages()
     }
 
     private fun handleRemoveAllFailedMessages() {
-        room.cancelAllFailedMessages()
+        room.sendService().cancelAllFailedMessages()
     }
 
     private fun observeEventDisplayedActions() {
@@ -956,7 +982,7 @@ class TimelineViewModel @AssistedInject constructor(
                     }
                     bufferedMostRecentDisplayedEvent.root.eventId?.let { eventId ->
                         session.coroutineScope.launch {
-                            tryOrNull { room.setReadReceipt(eventId) }
+                            tryOrNull { room.readService().setReadReceipt(eventId) }
                         }
                     }
                 }
@@ -973,14 +999,14 @@ class TimelineViewModel @AssistedInject constructor(
     private fun handleMarkAllAsRead() {
         setState { copy(unreadState = UnreadState.HasNoUnread) }
         viewModelScope.launch {
-            tryOrNull { room.markAsRead(ReadService.MarkAsReadParams.BOTH) }
+            tryOrNull { room.readService().markAsRead(ReadService.MarkAsReadParams.BOTH) }
         }
     }
 
     private fun handleReportContent(action: RoomDetailAction.ReportContent) {
         viewModelScope.launch {
             val event = try {
-                room.reportContent(action.eventId, -100, action.reason)
+                room.reportingService().reportContent(action.eventId, -100, action.reason)
                 RoomDetailViewEvents.ActionSuccess(action)
             } catch (failure: Exception) {
                 RoomDetailViewEvents.ActionFailure(action, failure)
@@ -996,7 +1022,7 @@ class TimelineViewModel @AssistedInject constructor(
 
         viewModelScope.launch {
             val event = try {
-                session.ignoreUserIds(listOf(action.userId))
+                session.userService().ignoreUserIds(listOf(action.userId))
                 RoomDetailViewEvents.ActionSuccess(action)
             } catch (failure: Throwable) {
                 RoomDetailViewEvents.ActionFailure(action, failure)
@@ -1011,7 +1037,8 @@ class TimelineViewModel @AssistedInject constructor(
                         supportedVerificationMethodsProvider.provide(),
                         action.otherUserId,
                         room.roomId,
-                        action.transactionId)) {
+                        action.transactionId
+                )) {
             _viewEvents.post(RoomDetailViewEvents.ActionSuccess(action))
         } else {
             // TODO
@@ -1022,7 +1049,8 @@ class TimelineViewModel @AssistedInject constructor(
         session.cryptoService().verificationService().declineVerificationRequestInDMs(
                 action.otherUserId,
                 action.transactionId,
-                room.roomId)
+                room.roomId
+        )
     }
 
     private fun handleRequestVerification(action: RoomDetailAction.RequestVerification) {
@@ -1035,9 +1063,13 @@ class TimelineViewModel @AssistedInject constructor(
         session.cryptoService().verificationService().getExistingVerificationRequestInRoom(room.roomId, action.transactionId)?.let {
             if (it.handledByOtherSession) return
             if (!it.isFinished) {
-                _viewEvents.post(RoomDetailViewEvents.ActionSuccess(action.copy(
-                        otherUserId = it.otherUserId
-                )))
+                _viewEvents.post(
+                        RoomDetailViewEvents.ActionSuccess(
+                                action.copy(
+                                        otherUserId = it.otherUserId
+                                )
+                        )
+                )
             }
         }
     }
@@ -1070,13 +1102,13 @@ class TimelineViewModel @AssistedInject constructor(
         room.getTimelineEvent(action.eventId)?.let { pollTimelineEvent ->
             val currentVote = pollTimelineEvent.annotations?.pollResponseSummary?.aggregatedContent?.myVote
             if (currentVote != action.optionKey) {
-                room.voteToPoll(action.eventId, action.optionKey)
+                room.sendService().voteToPoll(action.eventId, action.optionKey)
             }
         }
     }
 
     private fun handleEndPoll(eventId: String) {
-        room.endPoll(eventId)
+        room.sendService().endPoll(eventId)
     }
 
     private fun observeSyncState() {
@@ -1086,7 +1118,7 @@ class TimelineViewModel @AssistedInject constructor(
                     copy(syncState = syncState)
                 }
 
-        session.getSyncStatusLive()
+        session.syncStatusService().getSyncStatusLive()
                 .asFlow()
                 .filterIsInstance<SyncStatusService.Status.IncrementalSyncStatus>()
                 .setOnEach {
@@ -1190,7 +1222,7 @@ class TimelineViewModel @AssistedInject constructor(
             }
             if (summary.membership == Membership.INVITE) {
                 summary.inviterId?.let { inviterId ->
-                    session.getRoomMember(inviterId, summary.roomId)
+                    session.roomService().getRoomMember(inviterId, summary.roomId)
                 }?.also {
                     setState { copy(asyncInviter = Success(it)) }
                 }
@@ -1254,7 +1286,7 @@ class TimelineViewModel @AssistedInject constructor(
         timeline.removeAllListeners()
         decryptionFailureTracker.onTimeLineDisposed(room.roomId)
         if (vectorPreferences.sendTypingNotifs()) {
-            room.userStopsTyping()
+            room.typingService().userStopsTyping()
         }
         chatEffectManager.delegate = null
         chatEffectManager.dispose()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
index 9c81a39941..58ec9c76bc 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
@@ -28,6 +28,7 @@ import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.analytics.AnalyticsTracker
 import im.vector.app.features.analytics.extensions.toAnalyticsComposer
 import im.vector.app.features.analytics.extensions.toAnalyticsJoinedRoom
+import im.vector.app.features.analytics.plan.JoinedRoom
 import im.vector.app.features.attachments.toContentAttachmentData
 import im.vector.app.features.command.CommandParser
 import im.vector.app.features.command.ParsedCommand
@@ -50,6 +51,10 @@ import org.matrix.android.sdk.api.session.events.model.getRootThreadEventId
 import org.matrix.android.sdk.api.session.events.model.isThread
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.getRoomSummary
+import org.matrix.android.sdk.api.session.room.getStateEvent
+import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.model.RoomAvatarContent
 import org.matrix.android.sdk.api.session.room.model.RoomEncryptionAlgorithm
@@ -198,16 +203,18 @@ class MessageComposerViewModel @AssistedInject constructor(
                 is SendMode.Regular -> {
                     when (val parsedCommand = commandParser.parseSlashCommand(
                             textMessage = action.text,
-                            isInThreadTimeline = state.isInThreadTimeline())) {
+                            isInThreadTimeline = state.isInThreadTimeline()
+                    )) {
                         is ParsedCommand.ErrorNotACommand                  -> {
                             // Send the text message to the room
                             if (state.rootThreadEventId != null) {
-                                room.replyInThread(
+                                room.relationService().replyInThread(
                                         rootThreadEventId = state.rootThreadEventId,
                                         replyInThreadText = action.text,
-                                        autoMarkdown = action.autoMarkdown)
+                                        autoMarkdown = action.autoMarkdown
+                                )
                             } else {
-                                room.sendTextMessage(action.text, autoMarkdown = action.autoMarkdown)
+                                room.sendService().sendTextMessage(action.text, autoMarkdown = action.autoMarkdown)
                             }
 
                             _viewEvents.post(MessageComposerViewEvents.MessageSent)
@@ -228,12 +235,13 @@ class MessageComposerViewModel @AssistedInject constructor(
                         is ParsedCommand.SendPlainText                     -> {
                             // Send the text message to the room, without markdown
                             if (state.rootThreadEventId != null) {
-                                room.replyInThread(
+                                room.relationService().replyInThread(
                                         rootThreadEventId = state.rootThreadEventId,
                                         replyInThreadText = parsedCommand.message,
-                                        autoMarkdown = false)
+                                        autoMarkdown = false
+                                )
                             } else {
-                                room.sendTextMessage(parsedCommand.message, autoMarkdown = false)
+                                room.sendService().sendTextMessage(parsedCommand.message, autoMarkdown = false)
                             }
                             _viewEvents.post(MessageComposerViewEvents.MessageSent)
                             popDraft()
@@ -283,13 +291,18 @@ class MessageComposerViewModel @AssistedInject constructor(
                         }
                         is ParsedCommand.SendEmote                         -> {
                             if (state.rootThreadEventId != null) {
-                                room.replyInThread(
+                                room.relationService().replyInThread(
                                         rootThreadEventId = state.rootThreadEventId,
                                         replyInThreadText = parsedCommand.message,
                                         msgType = MessageType.MSGTYPE_EMOTE,
-                                        autoMarkdown = action.autoMarkdown)
+                                        autoMarkdown = action.autoMarkdown
+                                )
                             } else {
-                                room.sendTextMessage(parsedCommand.message, msgType = MessageType.MSGTYPE_EMOTE, autoMarkdown = action.autoMarkdown)
+                                room.sendService().sendTextMessage(
+                                        text = parsedCommand.message,
+                                        msgType = MessageType.MSGTYPE_EMOTE,
+                                        autoMarkdown = action.autoMarkdown
+                                )
                             }
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
                             popDraft()
@@ -297,12 +310,13 @@ class MessageComposerViewModel @AssistedInject constructor(
                         is ParsedCommand.SendRainbow                       -> {
                             val message = parsedCommand.message.toString()
                             if (state.rootThreadEventId != null) {
-                                room.replyInThread(
+                                room.relationService().replyInThread(
                                         rootThreadEventId = state.rootThreadEventId,
                                         replyInThreadText = parsedCommand.message,
-                                        formattedText = rainbowGenerator.generate(message))
+                                        formattedText = rainbowGenerator.generate(message)
+                                )
                             } else {
-                                room.sendFormattedTextMessage(message, rainbowGenerator.generate(message))
+                                room.sendService().sendFormattedTextMessage(message, rainbowGenerator.generate(message))
                             }
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
                             popDraft()
@@ -310,13 +324,14 @@ class MessageComposerViewModel @AssistedInject constructor(
                         is ParsedCommand.SendRainbowEmote                  -> {
                             val message = parsedCommand.message.toString()
                             if (state.rootThreadEventId != null) {
-                                room.replyInThread(
+                                room.relationService().replyInThread(
                                         rootThreadEventId = state.rootThreadEventId,
                                         replyInThreadText = parsedCommand.message,
                                         msgType = MessageType.MSGTYPE_EMOTE,
-                                        formattedText = rainbowGenerator.generate(message))
+                                        formattedText = rainbowGenerator.generate(message)
+                                )
                             } else {
-                                room.sendFormattedTextMessage(message, rainbowGenerator.generate(message), MessageType.MSGTYPE_EMOTE)
+                                room.sendService().sendFormattedTextMessage(message, rainbowGenerator.generate(message), MessageType.MSGTYPE_EMOTE)
                             }
 
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
@@ -326,14 +341,16 @@ class MessageComposerViewModel @AssistedInject constructor(
                             val text = "[${stringProvider.getString(R.string.spoiler)}](${parsedCommand.message})"
                             val formattedText = "<span data-mx-spoiler>${parsedCommand.message}</span>"
                             if (state.rootThreadEventId != null) {
-                                room.replyInThread(
+                                room.relationService().replyInThread(
                                         rootThreadEventId = state.rootThreadEventId,
                                         replyInThreadText = text,
-                                        formattedText = formattedText)
+                                        formattedText = formattedText
+                                )
                             } else {
-                                room.sendFormattedTextMessage(
+                                room.sendService().sendFormattedTextMessage(
                                         text,
-                                        formattedText)
+                                        formattedText
+                                )
                             }
                             _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
                             popDraft()
@@ -374,7 +391,7 @@ class MessageComposerViewModel @AssistedInject constructor(
                             popDraft()
                         }
                         is ParsedCommand.DiscardSession                    -> {
-                            if (room.isEncrypted()) {
+                            if (room.roomCryptoService().isEncrypted()) {
                                 session.cryptoService().discardOutboundSession(room.roomId)
                                 _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
                                 popDraft()
@@ -445,7 +462,7 @@ class MessageComposerViewModel @AssistedInject constructor(
                         is ParsedCommand.LeaveRoom                         -> {
                             viewModelScope.launch(Dispatchers.IO) {
                                 try {
-                                    session.leaveRoom(parsedCommand.roomId)
+                                    session.roomService().leaveRoom(parsedCommand.roomId)
                                     popDraft()
                                     _viewEvents.post(MessageComposerViewEvents.SlashCommandResultOk(parsedCommand))
                                 } catch (failure: Throwable) {
@@ -486,16 +503,18 @@ class MessageComposerViewModel @AssistedInject constructor(
                     if (inReplyTo != null) {
                         // TODO check if same content?
                         room.getTimelineEvent(inReplyTo)?.let {
-                            room.editReply(state.sendMode.timelineEvent, it, action.text.toString())
+                            room.relationService().editReply(state.sendMode.timelineEvent, it, action.text.toString())
                         }
                     } else {
                         val messageContent = state.sendMode.timelineEvent.getLastMessageContent()
                         val existingBody = messageContent?.body ?: ""
                         if (existingBody != action.text) {
-                            room.editTextMessage(state.sendMode.timelineEvent,
+                            room.relationService().editTextMessage(
+                                    state.sendMode.timelineEvent,
                                     messageContent?.msgType ?: MessageType.MSGTYPE_TEXT,
                                     action.text,
-                                    action.autoMarkdown)
+                                    action.autoMarkdown
+                            )
                         } else {
                             Timber.w("Same message content, do not send edition")
                         }
@@ -504,11 +523,12 @@ class MessageComposerViewModel @AssistedInject constructor(
                     popDraft()
                 }
                 is SendMode.Quote   -> {
-                    room.sendQuotedTextMessage(
+                    room.sendService().sendQuotedTextMessage(
                             quotedEvent = state.sendMode.timelineEvent,
                             text = action.text.toString(),
                             autoMarkdown = action.autoMarkdown,
-                            rootThreadEventId = state.rootThreadEventId)
+                            rootThreadEventId = state.rootThreadEventId
+                    )
                     _viewEvents.post(MessageComposerViewEvents.MessageSent)
                     popDraft()
                 }
@@ -518,12 +538,13 @@ class MessageComposerViewModel @AssistedInject constructor(
                     // If threads are disabled this will make the fallback replies visible to clients with threads enabled
                     val rootThreadEventId = if (showInThread) timelineEvent.root.getRootThreadEventId() else null
                     state.rootThreadEventId?.let {
-                        room.replyInThread(
+                        room.relationService().replyInThread(
                                 rootThreadEventId = it,
                                 replyInThreadText = action.text.toString(),
                                 autoMarkdown = action.autoMarkdown,
-                                eventReplied = timelineEvent)
-                    } ?: room.replyToMessage(
+                                eventReplied = timelineEvent
+                        )
+                    } ?: room.relationService().replyToMessage(
                             eventReplied = timelineEvent,
                             replyText = action.text.toString(),
                             autoMarkdown = action.autoMarkdown,
@@ -549,13 +570,13 @@ class MessageComposerViewModel @AssistedInject constructor(
             // Otherwise we clear the composer and remove the draft from db
             setState { copy(sendMode = SendMode.Regular("", false)) }
             viewModelScope.launch {
-                room.deleteDraft()
+                room.draftService().deleteDraft()
             }
         }
     }
 
     private fun loadDraftIfAny() {
-        val currentDraft = room.getDraft()
+        val currentDraft = room.draftService().getDraft()
         setState {
             copy(
                     // Create a sendMode from a draft and retrieve the TimelineEvent
@@ -586,9 +607,9 @@ class MessageComposerViewModel @AssistedInject constructor(
     private fun handleUserIsTyping(action: MessageComposerAction.UserIsTyping) {
         if (vectorPreferences.sendTypingNotifs()) {
             if (action.isTyping) {
-                room.userIsTyping()
+                room.typingService().userIsTyping()
             } else {
-                room.userStopsTyping()
+                room.typingService().userStopsTyping()
             }
         }
     }
@@ -596,26 +617,28 @@ class MessageComposerViewModel @AssistedInject constructor(
     private fun sendChatEffect(sendChatEffect: ParsedCommand.SendChatEffect) {
         // If message is blank, convert to an emote, with default message
         if (sendChatEffect.message.isBlank()) {
-            val defaultMessage = stringProvider.getString(when (sendChatEffect.chatEffect) {
-                ChatEffect.CONFETTI -> R.string.default_message_emote_confetti
-                ChatEffect.SNOWFALL -> R.string.default_message_emote_snow
-            })
-            room.sendTextMessage(defaultMessage, MessageType.MSGTYPE_EMOTE)
+            val defaultMessage = stringProvider.getString(
+                    when (sendChatEffect.chatEffect) {
+                        ChatEffect.CONFETTI -> R.string.default_message_emote_confetti
+                        ChatEffect.SNOWFALL -> R.string.default_message_emote_snow
+                    }
+            )
+            room.sendService().sendTextMessage(defaultMessage, MessageType.MSGTYPE_EMOTE)
         } else {
-            room.sendTextMessage(sendChatEffect.message, sendChatEffect.chatEffect.toMessageType())
+            room.sendService().sendTextMessage(sendChatEffect.message, sendChatEffect.chatEffect.toMessageType())
         }
     }
 
     private fun handleJoinToAnotherRoomSlashCommand(command: ParsedCommand.JoinRoom) {
         viewModelScope.launch {
             try {
-                session.joinRoom(command.roomAlias, command.reason, emptyList())
+                session.roomService().joinRoom(command.roomAlias, command.reason, emptyList())
             } catch (failure: Throwable) {
                 _viewEvents.post(MessageComposerViewEvents.SlashCommandResultError(failure))
                 return@launch
             }
             session.getRoomSummary(command.roomAlias)
-                    ?.also { analyticsTracker.capture(it.toAnalyticsJoinedRoom()) }
+                    ?.also { analyticsTracker.capture(it.toAnalyticsJoinedRoom(JoinedRoom.Trigger.SlashCommand)) }
                     ?.roomId
                     ?.let {
                         _viewEvents.post(MessageComposerViewEvents.JoinRoomCommandSuccess(it))
@@ -645,19 +668,19 @@ class MessageComposerViewModel @AssistedInject constructor(
 
     private fun handleChangeTopicSlashCommand(changeTopic: ParsedCommand.ChangeTopic) {
         launchSlashCommandFlowSuspendable(changeTopic) {
-            room.updateTopic(changeTopic.topic)
+            room.stateService().updateTopic(changeTopic.topic)
         }
     }
 
     private fun handleInviteSlashCommand(invite: ParsedCommand.Invite) {
         launchSlashCommandFlowSuspendable(invite) {
-            room.invite(invite.userId, invite.reason)
+            room.membershipService().invite(invite.userId, invite.reason)
         }
     }
 
     private fun handleInvite3pidSlashCommand(invite: ParsedCommand.Invite3Pid) {
         launchSlashCommandFlowSuspendable(invite) {
-            room.invite3pid(invite.threePid)
+            room.membershipService().invite3pid(invite.threePid)
         }
     }
 
@@ -670,13 +693,13 @@ class MessageComposerViewModel @AssistedInject constructor(
                 ?: return
 
         launchSlashCommandFlowSuspendable(setUserPowerLevel) {
-            room.sendStateEvent(EventType.STATE_ROOM_POWER_LEVELS, stateKey = "", newPowerLevelsContent)
+            room.stateService().sendStateEvent(EventType.STATE_ROOM_POWER_LEVELS, stateKey = "", newPowerLevelsContent)
         }
     }
 
     private fun handleChangeDisplayNameSlashCommand(changeDisplayName: ParsedCommand.ChangeDisplayName) {
         launchSlashCommandFlowSuspendable(changeDisplayName) {
-            session.setDisplayName(session.myUserId, changeDisplayName.displayName)
+            session.profileService().setDisplayName(session.myUserId, changeDisplayName.displayName)
         }
     }
 
@@ -691,32 +714,32 @@ class MessageComposerViewModel @AssistedInject constructor(
                         ?.let { session.getRoom(it) }
             }
                     ?.let {
-                        session.leaveRoom(it.roomId)
+                        session.roomService().leaveRoom(it.roomId)
                     }
         }
     }
 
     private fun handleRemoveSlashCommand(removeUser: ParsedCommand.RemoveUser) {
         launchSlashCommandFlowSuspendable(removeUser) {
-            room.remove(removeUser.userId, removeUser.reason)
+            room.membershipService().remove(removeUser.userId, removeUser.reason)
         }
     }
 
     private fun handleBanSlashCommand(ban: ParsedCommand.BanUser) {
         launchSlashCommandFlowSuspendable(ban) {
-            room.ban(ban.userId, ban.reason)
+            room.membershipService().ban(ban.userId, ban.reason)
         }
     }
 
     private fun handleUnbanSlashCommand(unban: ParsedCommand.UnbanUser) {
         launchSlashCommandFlowSuspendable(unban) {
-            room.unban(unban.userId, unban.reason)
+            room.membershipService().unban(unban.userId, unban.reason)
         }
     }
 
     private fun handleChangeRoomNameSlashCommand(changeRoomName: ParsedCommand.ChangeRoomName) {
         launchSlashCommandFlowSuspendable(changeRoomName) {
-            room.updateName(changeRoomName.name)
+            room.stateService().updateName(changeRoomName.name)
         }
     }
 
@@ -732,14 +755,14 @@ class MessageComposerViewModel @AssistedInject constructor(
                     ?.copy(displayName = changeDisplayName.displayName)
                     ?.toContent()
                     ?.let {
-                        room.sendStateEvent(EventType.STATE_ROOM_MEMBER, session.myUserId, it)
+                        room.stateService().sendStateEvent(EventType.STATE_ROOM_MEMBER, session.myUserId, it)
                     }
         }
     }
 
     private fun handleChangeRoomAvatarSlashCommand(changeAvatar: ParsedCommand.ChangeRoomAvatar) {
         launchSlashCommandFlowSuspendable(changeAvatar) {
-            room.sendStateEvent(EventType.STATE_ROOM_AVATAR, stateKey = "", RoomAvatarContent(changeAvatar.url).toContent())
+            room.stateService().sendStateEvent(EventType.STATE_ROOM_AVATAR, stateKey = "", RoomAvatarContent(changeAvatar.url).toContent())
         }
     }
 
@@ -749,14 +772,14 @@ class MessageComposerViewModel @AssistedInject constructor(
                     ?.copy(avatarUrl = changeAvatar.url)
                     ?.toContent()
                     ?.let {
-                        room.sendStateEvent(EventType.STATE_ROOM_MEMBER, session.myUserId, it)
+                        room.stateService().sendStateEvent(EventType.STATE_ROOM_MEMBER, session.myUserId, it)
                     }
         }
     }
 
     private fun handleIgnoreSlashCommand(ignore: ParsedCommand.IgnoreUser) {
         launchSlashCommandFlowSuspendable(ignore) {
-            session.ignoreUserIds(listOf(ignore.userId))
+            session.userService().ignoreUserIds(listOf(ignore.userId))
         }
     }
 
@@ -773,7 +796,7 @@ class MessageComposerViewModel @AssistedInject constructor(
 
     private fun handleUnignoreSlashCommandConfirmed(unignore: ParsedCommand.UnignoreUser) {
         launchSlashCommandFlowSuspendable(unignore) {
-            session.unIgnoreUserIds(listOf(unignore.userId))
+            session.userService().unIgnoreUserIds(listOf(unignore.userId))
         }
     }
 
@@ -790,8 +813,8 @@ class MessageComposerViewModel @AssistedInject constructor(
             }
         }
         rootThreadEventId?.let {
-            room.replyInThread(it, sequence)
-        } ?: room.sendTextMessage(sequence)
+            room.relationService().replyInThread(it, sequence)
+        } ?: room.sendService().sendTextMessage(sequence)
     }
 
     /**
@@ -802,19 +825,19 @@ class MessageComposerViewModel @AssistedInject constructor(
             when {
                 it.sendMode is SendMode.Regular && !it.sendMode.fromSharing -> {
                     setState { copy(sendMode = it.sendMode.copy(text = draft)) }
-                    room.saveDraft(UserDraft.Regular(draft))
+                    room.draftService().saveDraft(UserDraft.Regular(draft))
                 }
                 it.sendMode is SendMode.Reply                               -> {
                     setState { copy(sendMode = it.sendMode.copy(text = draft)) }
-                    room.saveDraft(UserDraft.Reply(it.sendMode.timelineEvent.root.eventId!!, draft))
+                    room.draftService().saveDraft(UserDraft.Reply(it.sendMode.timelineEvent.root.eventId!!, draft))
                 }
                 it.sendMode is SendMode.Quote                               -> {
                     setState { copy(sendMode = it.sendMode.copy(text = draft)) }
-                    room.saveDraft(UserDraft.Quote(it.sendMode.timelineEvent.root.eventId!!, draft))
+                    room.draftService().saveDraft(UserDraft.Quote(it.sendMode.timelineEvent.root.eventId!!, draft))
                 }
                 it.sendMode is SendMode.Edit                                -> {
                     setState { copy(sendMode = it.sendMode.copy(text = draft)) }
-                    room.saveDraft(UserDraft.Edit(it.sendMode.timelineEvent.root.eventId!!, draft))
+                    room.draftService().saveDraft(UserDraft.Edit(it.sendMode.timelineEvent.root.eventId!!, draft))
                 }
             }
         }
@@ -835,11 +858,12 @@ class MessageComposerViewModel @AssistedInject constructor(
         } else {
             audioMessageHelper.stopRecording(convertForSending = true)?.let { audioType ->
                 if (audioType.duration > 1000) {
-                    room.sendMedia(
+                    room.sendService().sendMedia(
                             attachment = audioType.toContentAttachmentData(isVoiceMessage = true),
                             compressBeforeSending = false,
                             roomIds = emptySet(),
-                            rootThreadEventId = rootThreadEventId)
+                            rootThreadEventId = rootThreadEventId
+                    )
                 } else {
                     audioMessageHelper.deleteRecording()
                 }
@@ -902,7 +926,7 @@ class MessageComposerViewModel @AssistedInject constructor(
             viewModelScope.launch {
                 playingAudioContent?.toContentAttachmentData()?.let { voiceDraft ->
                     val content = voiceDraft.toJsonString()
-                    room.saveDraft(UserDraft.Voice(content))
+                    room.draftService().saveDraft(UserDraft.Voice(content))
                     setState { copy(sendMode = SendMode.Voice(content)) }
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
index 95553eb1cd..016a39d919 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
@@ -21,6 +21,7 @@ import im.vector.app.features.home.room.detail.arguments.TimelineArgs
 import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import kotlin.random.Random
 
 /**
  * Describes the current send mode:
@@ -35,7 +36,7 @@ sealed interface SendMode {
             val text: String,
             val fromSharing: Boolean,
             // This is necessary for forcing refresh on selectSubscribe
-            private val ts: Long = System.currentTimeMillis()
+            private val random: Int = Random.nextInt()
     ) : SendMode
 
     data class Quote(val timelineEvent: TimelineEvent, val text: String) : SendMode
@@ -83,7 +84,8 @@ data class MessageComposerViewState(
     constructor(args: TimelineArgs) : this(
             roomId = args.roomId,
             startsThread = args.threadTimelineArgs?.startsThread.orFalse(),
-            rootThreadEventId = args.threadTimelineArgs?.rootThreadEventId)
+            rootThreadEventId = args.threadTimelineArgs?.rootThreadEventId
+    )
 
     fun isInThreadTimeline(): Boolean = rootThreadEventId != null
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsController.kt
index bf88218fa6..c316c556b0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsController.kt
@@ -31,7 +31,7 @@ import javax.inject.Inject
 class DisplayReadReceiptsController @Inject constructor(private val dateFormatter: VectorDateFormatter,
                                                         private val session: Session,
                                                         private val avatarRender: AvatarRenderer) :
-    TypedEpoxyController<List<ReadReceiptData>>() {
+        TypedEpoxyController<List<ReadReceiptData>>() {
 
     var listener: Listener? = null
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
index b3543ae579..1952e598a6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
@@ -37,6 +37,7 @@ import im.vector.app.core.extensions.trackItemsVisibilityChange
 import im.vector.app.core.platform.StateView
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentSearchBinding
+import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.home.room.threads.arguments.ThreadTimelineArgs
 import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.session.events.model.Event
@@ -97,7 +98,8 @@ class SearchFragment @Inject constructor(
                 is Success -> {
                     views.stateView.state = StateView.State.Empty(
                             title = getString(R.string.search_no_results),
-                            image = ContextCompat.getDrawable(requireContext(), R.drawable.ic_search_no_results))
+                            image = ContextCompat.getDrawable(requireContext(), R.drawable.ic_search_no_results)
+                    )
                 }
                 else       -> Unit
             }
@@ -132,9 +134,19 @@ class SearchFragment @Inject constructor(
                     displayName = fragmentArgs.roomDisplayName,
                     avatarUrl = fragmentArgs.roomAvatarUrl,
                     roomEncryptionTrustLevel = null,
-                    rootThreadEventId = it)
+                    rootThreadEventId = it
+            )
             navigator.openThread(requireContext(), threadTimelineArgs, event.eventId)
-        } ?: navigator.openRoom(requireContext(), roomId, event.eventId)
+        } ?: openRoom(roomId, event.eventId)
+    }
+
+    private fun openRoom(roomId: String, eventId: String?) {
+        navigator.openRoom(
+                context = requireContext(),
+                roomId = roomId,
+                eventId = eventId,
+                trigger = ViewRoom.Trigger.MessageSearch
+        )
     }
 
     override fun loadMore() {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
index 5b1f17cfe2..913e440a20 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
@@ -30,6 +30,7 @@ import im.vector.app.core.epoxy.loadingItem
 import im.vector.app.core.epoxy.noResultItem
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.resources.UserPreferencesProvider
+import im.vector.app.core.time.Clock
 import im.vector.app.core.ui.list.GenericHeaderItem_
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.format.DisplayableEventFormatter
@@ -47,7 +48,8 @@ class SearchResultController @Inject constructor(
         private val stringProvider: StringProvider,
         private val dateFormatter: VectorDateFormatter,
         private val displayableEventFormatter: DisplayableEventFormatter,
-        private val userPreferencesProvider: UserPreferencesProvider
+        private val userPreferencesProvider: UserPreferencesProvider,
+        private val clock: Clock,
 ) : TypedEpoxyController<SearchViewState>() {
 
     var listener: Listener? = null
@@ -109,7 +111,7 @@ class SearchResultController @Inject constructor(
             val spannable = setHighLightedText(text, data.highlights) ?: return@forEach
 
             val eventDate = Calendar.getInstance().apply {
-                timeInMillis = eventAndSender.event.originServerTs ?: System.currentTimeMillis()
+                timeInMillis = eventAndSender.event.originServerTs ?: clock.epochMillis()
             }
             if (lastDate?.get(Calendar.DAY_OF_YEAR) != eventDate.get(Calendar.DAY_OF_YEAR)) {
                 GenericHeaderItem_()
@@ -124,8 +126,10 @@ class SearchResultController @Inject constructor(
                     .avatarRenderer(avatarRenderer)
                     .formattedDate(dateFormatter.format(event.originServerTs, DateFormatKind.MESSAGE_SIMPLE))
                     .spannable(spannable.toEpoxyCharSequence())
-                    .sender(eventAndSender.sender
-                            ?: eventAndSender.event.senderId?.let { session.getRoomMember(it, data.roomId) }?.toMatrixItem())
+                    .sender(
+                            eventAndSender.sender
+                                    ?: eventAndSender.event.senderId?.let { session.roomService().getRoomMember(it, data.roomId) }?.toMatrixItem()
+                    )
                     .threadDetails(event.threadDetails)
                     .threadSummaryFormatted(displayableEventFormatter.formatThreadSummary(event.threadDetails?.threadSummaryLatestEvent).toString())
                     .areThreadMessagesEnabled(userPreferencesProvider.areThreadMessagesEnabled())
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
index 1702fb95cd..561023401f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
@@ -30,11 +30,12 @@ import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.search.SearchResult
 
 class SearchViewModel @AssistedInject constructor(
         @Assisted private val initialState: SearchViewState,
-        session: Session
+        private val session: Session
 ) : VectorViewModel<SearchViewState, SearchAction, SearchViewEvents>(initialState) {
 
     private val room = session.getRoom(initialState.roomId)
@@ -100,8 +101,9 @@ class SearchViewModel @AssistedInject constructor(
 
         currentTask = viewModelScope.launch {
             try {
-                val result = room.search(
+                val result = session.searchService().search(
                         searchTerm = state.searchTerm,
+                        roomId = initialState.roomId,
                         nextBatch = nextBatch,
                         orderByRecent = true,
                         beforeLimit = 0,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
index 981e5740d7..6c9f7ac4ff 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
@@ -31,6 +31,7 @@ import im.vector.app.core.epoxy.LoadingItem_
 import im.vector.app.core.extensions.localDateTime
 import im.vector.app.core.extensions.nextOrNull
 import im.vector.app.core.extensions.prevOrNull
+import im.vector.app.core.time.Clock
 import im.vector.app.features.home.room.detail.JitsiState
 import im.vector.app.features.home.room.detail.RoomDetailAction
 import im.vector.app.features.home.room.detail.RoomDetailViewState
@@ -78,19 +79,21 @@ import javax.inject.Inject
 import kotlin.math.min
 import kotlin.system.measureTimeMillis
 
-class TimelineEventController @Inject constructor(private val dateFormatter: VectorDateFormatter,
-                                                  private val vectorPreferences: VectorPreferences,
-                                                  private val contentUploadStateTrackerBinder: ContentUploadStateTrackerBinder,
-                                                  private val contentDownloadStateTrackerBinder: ContentDownloadStateTrackerBinder,
-                                                  private val timelineItemFactory: TimelineItemFactory,
-                                                  private val timelineMediaSizeProvider: TimelineMediaSizeProvider,
-                                                  private val mergedHeaderItemFactory: MergedHeaderItemFactory,
-                                                  private val session: Session,
-                                                  @TimelineEventControllerHandler
-                                                  private val backgroundHandler: Handler,
-                                                  private val timelineEventVisibilityHelper: TimelineEventVisibilityHelper,
-                                                  private val readReceiptsItemFactory: ReadReceiptsItemFactory,
-                                                  private val reactionListFactory: ReactionsSummaryFactory
+class TimelineEventController @Inject constructor(
+        private val dateFormatter: VectorDateFormatter,
+        private val vectorPreferences: VectorPreferences,
+        private val contentUploadStateTrackerBinder: ContentUploadStateTrackerBinder,
+        private val contentDownloadStateTrackerBinder: ContentDownloadStateTrackerBinder,
+        private val timelineItemFactory: TimelineItemFactory,
+        private val timelineMediaSizeProvider: TimelineMediaSizeProvider,
+        private val mergedHeaderItemFactory: MergedHeaderItemFactory,
+        private val session: Session,
+        @TimelineEventControllerHandler
+        private val backgroundHandler: Handler,
+        private val timelineEventVisibilityHelper: TimelineEventVisibilityHelper,
+        private val readReceiptsItemFactory: ReadReceiptsItemFactory,
+        private val reactionListFactory: ReactionsSummaryFactory,
+        private val clock: Clock,
 ) : EpoxyController(backgroundHandler, backgroundHandler), Timeline.Listener, EpoxyController.Interceptor {
 
     /**
@@ -132,6 +135,7 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
                                   mediaData: ImageContentRenderer.Data,
                                   view: View,
                                   inMemory: List<AttachmentData>)
+
         fun onVideoMessageClicked(messageVideoContent: MessageVideoContent, mediaData: VideoContentRenderer.Data, view: View)
 
         //        fun onFileMessageClicked(eventId: String, messageFileContent: MessageFileContent)
@@ -208,8 +212,10 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
         override fun onChanged(position: Int, count: Int, payload: Any?) {
             synchronized(modelCache) {
                 assertUpdateCallbacksAllowed()
-                Timber.v("listUpdateCallback.onChanged(position: $position, count: $count). " +
-                        "\ncurrentSnapshot has size of ${currentSnapshot.size} items")
+                Timber.v(
+                        "listUpdateCallback.onChanged(position: $position, count: $count). " +
+                                "\ncurrentSnapshot has size of ${currentSnapshot.size} items"
+                )
                 (position until position + count).forEach {
                     // Invalidate cache
                     modelCache[it] = null
@@ -237,8 +243,10 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
         override fun onMoved(fromPosition: Int, toPosition: Int) {
             synchronized(modelCache) {
                 assertUpdateCallbacksAllowed()
-                Timber.v("listUpdateCallback.onMoved(fromPosition: $fromPosition, toPosition: $toPosition). " +
-                        "\ncurrentSnapshot has size of ${currentSnapshot.size} items")
+                Timber.v(
+                        "listUpdateCallback.onMoved(fromPosition: $fromPosition, toPosition: $toPosition). " +
+                                "\ncurrentSnapshot has size of ${currentSnapshot.size} items"
+                )
                 val model = modelCache.removeAt(fromPosition)
                 modelCache.add(toPosition, model)
                 requestModelBuild()
@@ -248,8 +256,10 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
         override fun onInserted(position: Int, count: Int) {
             synchronized(modelCache) {
                 assertUpdateCallbacksAllowed()
-                Timber.v("listUpdateCallback.onInserted(position: $position, count: $count). " +
-                        "\ncurrentSnapshot has size of ${currentSnapshot.size} items")
+                Timber.v(
+                        "listUpdateCallback.onInserted(position: $position, count: $count). " +
+                                "\ncurrentSnapshot has size of ${currentSnapshot.size} items"
+                )
                 repeat(count) {
                     modelCache.add(position, null)
                 }
@@ -260,8 +270,10 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
         override fun onRemoved(position: Int, count: Int) {
             synchronized(modelCache) {
                 assertUpdateCallbacksAllowed()
-                Timber.v("listUpdateCallback.onRemoved(position: $position, count: $count). " +
-                        "\ncurrentSnapshot has size of ${currentSnapshot.size} items")
+                Timber.v(
+                        "listUpdateCallback.onRemoved(position: $position, count: $count). " +
+                                "\ncurrentSnapshot has size of ${currentSnapshot.size} items"
+                )
                 repeat(count) {
                     modelCache.removeAt(position)
                 }
@@ -313,7 +325,7 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
         if (partialState.roomSummary?.membership != Membership.JOIN) {
             return
         }
-        val timestamp = System.currentTimeMillis()
+        val timestamp = clock.epochMillis()
 
         val showingForwardLoader = LoadingItem_()
                 .id("forward_loading_item_$timestamp")
@@ -405,14 +417,16 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
                             timelineEvent = it,
                             highlightedEventId = partialState.highlightedEventId,
                             isFromThreadTimeline = partialState.isFromThreadTimeline(),
-                            rootThreadEventId = partialState.rootThreadEventId)
+                            rootThreadEventId = partialState.rootThreadEventId
+                    )
                 }
                 val nextDisplayableEvent = currentSnapshot.subList(position + 1, currentSnapshot.size).firstOrNull {
                     timelineEventVisibilityHelper.shouldShowEvent(
                             timelineEvent = it,
                             highlightedEventId = partialState.highlightedEventId,
                             isFromThreadTimeline = partialState.isFromThreadTimeline(),
-                            rootThreadEventId = partialState.rootThreadEventId)
+                            rootThreadEventId = partialState.rootThreadEventId
+                    )
                 }
                 val timelineEventsGroup = timelineEventsGroups.getOrNull(event)
                 val params = TimelineItemFactoryParams(
@@ -465,7 +479,8 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
                                                position: Int,
                                                receiptsByEvents: Map<String, List<ReadReceipt>>): CacheItemData {
         val wantsDateSeparator = wantsDateSeparator(event, nextEvent)
-        val mergedHeaderModel = mergedHeaderItemFactory.create(event,
+        val mergedHeaderModel = mergedHeaderItemFactory.create(
+                event,
                 nextEvent = nextEvent,
                 partialState = partialState,
                 items = this@TimelineEventController.currentSnapshot,
@@ -536,7 +551,8 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
                             timelineEvent = event,
                             highlightedEventId = partialState.highlightedEventId,
                             isFromThreadTimeline = partialState.isFromThreadTimeline(),
-                            rootThreadEventId = partialState.rootThreadEventId)) {
+                            rootThreadEventId = partialState.rootThreadEventId
+                    )) {
                 lastShownEventId = event.eventId
             }
             if (lastShownEventId == null) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt
index 0cf7e60eae..57b2912aff 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt
@@ -57,7 +57,8 @@ data class MessageActionState(
             roomId = args.roomId,
             eventId = args.eventId,
             informationData = args.informationData,
-            isFromThreadTimeline = args.isFromThreadTimeline)
+            isFromThreadTimeline = args.isFromThreadTimeline
+    )
 
     fun senderName(): String = informationData.memberName?.toString() ?: ""
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index 9a73afd897..2f9f2331e0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -48,6 +48,7 @@ import org.matrix.android.sdk.api.session.events.model.isAttachmentMessage
 import org.matrix.android.sdk.api.session.events.model.isTextMessage
 import org.matrix.android.sdk.api.session.events.model.isThread
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageFormat
 import org.matrix.android.sdk.api.session.room.model.message.MessagePollContent
@@ -376,19 +377,23 @@ class MessageActionsViewModel @AssistedInject constructor(
 
             if (canRedact(timelineEvent, actionPermissions)) {
                 if (timelineEvent.root.getClearType() in EventType.POLL_START) {
-                    add(EventSharedAction.Redact(
-                            eventId,
-                            askForReason = informationData.senderId != session.myUserId,
-                            dialogTitleRes = R.string.delete_poll_dialog_title,
-                            dialogDescriptionRes = R.string.delete_poll_dialog_content
-                    ))
+                    add(
+                            EventSharedAction.Redact(
+                                    eventId,
+                                    askForReason = informationData.senderId != session.myUserId,
+                                    dialogTitleRes = R.string.delete_poll_dialog_title,
+                                    dialogDescriptionRes = R.string.delete_poll_dialog_content
+                            )
+                    )
                 } else {
-                    add(EventSharedAction.Redact(
-                            eventId,
-                            askForReason = informationData.senderId != session.myUserId,
-                            dialogTitleRes = R.string.delete_event_dialog_title,
-                            dialogDescriptionRes = R.string.delete_event_dialog_content
-                    ))
+                    add(
+                            EventSharedAction.Redact(
+                                    eventId,
+                                    askForReason = informationData.senderId != session.myUserId,
+                                    dialogTitleRes = R.string.delete_event_dialog_title,
+                                    dialogDescriptionRes = R.string.delete_event_dialog_content
+                            )
+                    )
                 }
             }
         }
@@ -452,6 +457,10 @@ class MessageActionsViewModel @AssistedInject constructor(
                                  actionPermissions: ActionPermissions): Boolean {
         // We let reply in thread visible even if threads are not enabled, with an enhanced flow to attract users
 //        if (!vectorPreferences.areThreadMessagesEnabled()) return false
+        // Disable beta prompt if the homeserver do not support threads
+        if (!vectorPreferences.areThreadMessagesEnabled() &&
+                !session.homeServerCapabilitiesService().getHomeServerCapabilities().canUseThreading) return false
+
         if (initialState.isFromThreadTimeline) return false
         if (event.root.isThread()) return false
         if (event.root.getClearType() != EventType.MESSAGE &&
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt
index 321745355e..0548a6ad18 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt
@@ -51,7 +51,8 @@ class ViewEditHistoryBottomSheet :
         views.bottomSheetRecyclerView.configureWith(
                 epoxyController,
                 dividerDrawable = R.drawable.divider_horizontal_on_secondary,
-                hasFixedSize = false)
+                hasFixedSize = false
+        )
         views.bottomSheetTitle.text = context?.getString(R.string.message_edits)
     }
 
@@ -68,11 +69,13 @@ class ViewEditHistoryBottomSheet :
     companion object {
         fun newInstance(roomId: String, informationData: MessageInformationData): ViewEditHistoryBottomSheet {
             return ViewEditHistoryBottomSheet().apply {
-                setArguments(TimelineEventFragmentArgs(
-                        eventId = informationData.eventId,
-                        roomId = roomId,
-                        informationData = informationData
-                ))
+                setArguments(
+                        TimelineEventFragmentArgs(
+                                eventId = informationData.eventId,
+                                roomId = roomId,
+                                informationData = informationData
+                        )
+                )
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt
index 63a34fe713..f96ee7eee2 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt
@@ -26,6 +26,7 @@ import im.vector.app.core.date.DateFormatKind
 import im.vector.app.core.date.VectorDateFormatter
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.time.Clock
 import im.vector.app.core.ui.list.genericFooterItem
 import im.vector.app.core.ui.list.genericHeaderItem
 import im.vector.app.core.ui.list.genericItem
@@ -49,7 +50,8 @@ class ViewEditHistoryEpoxyController @Inject constructor(
         private val stringProvider: StringProvider,
         private val colorProvider: ColorProvider,
         private val eventHtmlRenderer: EventHtmlRenderer,
-        private val dateFormatter: VectorDateFormatter
+        private val dateFormatter: VectorDateFormatter,
+        private val clock: Clock,
 ) : TypedEpoxyController<ViewEditHistoryViewState>() {
 
     override fun buildModels(state: ViewEditHistoryViewState) {
@@ -86,7 +88,7 @@ class ViewEditHistoryEpoxyController @Inject constructor(
 
                 val evDate = Calendar.getInstance().apply {
                     timeInMillis = timelineEvent.originServerTs
-                            ?: System.currentTimeMillis()
+                            ?: clock.epochMillis()
                 }
                 if (lastDate?.get(Calendar.DAY_OF_YEAR) != evDate.get(Calendar.DAY_OF_YEAR)) {
                     // need to display header with day
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
index e1d4d71c6a..c8a3bb8967 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
@@ -32,6 +32,7 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
 import org.matrix.android.sdk.api.session.crypto.model.OlmDecryptionResult
 import org.matrix.android.sdk.api.session.events.model.isReply
+import org.matrix.android.sdk.api.session.getRoom
 import timber.log.Timber
 import java.util.UUID
 
@@ -61,7 +62,7 @@ class ViewEditHistoryViewModel @AssistedInject constructor(
 
         viewModelScope.launch {
             val data = try {
-                room.fetchEditHistory(eventId)
+                room.relationService().fetchEditHistory(eventId)
             } catch (failure: Throwable) {
                 setState {
                     copy(editList = Fail(failure))
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewState.kt
index 61a400d875..dd344c4c82 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewState.kt
@@ -27,7 +27,7 @@ data class ViewEditHistoryViewState(
         val roomId: String,
         val isOriginalAReply: Boolean = false,
         val editList: Async<List<Event>> = Uninitialized) :
-    MavericksState {
+        MavericksState {
 
     constructor(args: TimelineEventFragmentArgs) : this(roomId = args.roomId, eventId = args.eventId)
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
index 89899a52e0..0cbd92f525 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
@@ -29,6 +29,7 @@ import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.content.EncryptionEventContent
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoomSummary
 import javax.inject.Inject
 
 class EncryptionItemFactory @Inject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationMessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationMessageItemFactory.kt
index 9bc148a562..d233deffb8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationMessageItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/LiveLocationMessageItemFactory.kt
@@ -24,7 +24,7 @@ import im.vector.app.features.home.room.detail.timeline.item.AbsMessageItem
 import im.vector.app.features.home.room.detail.timeline.item.MessageLiveLocationStartItem
 import im.vector.app.features.home.room.detail.timeline.item.MessageLiveLocationStartItem_
 import org.matrix.android.sdk.api.extensions.orFalse
-import org.matrix.android.sdk.api.session.room.model.livelocation.LiveLocationBeaconContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconInfoContent
 import javax.inject.Inject
 
 class LiveLocationMessageItemFactory @Inject constructor(
@@ -34,19 +34,20 @@ class LiveLocationMessageItemFactory @Inject constructor(
 ) {
 
     fun create(
-            liveLocationContent: LiveLocationBeaconContent,
+            beaconInfoContent: MessageBeaconInfoContent,
             highlight: Boolean,
             attributes: AbsMessageItem.Attributes,
     ): VectorEpoxyModel<*>? {
         // TODO handle location received and stopped states
         return when {
-            isLiveRunning(liveLocationContent) -> buildStartLiveItem(highlight, attributes)
-            else                               -> null
+            isLiveRunning(beaconInfoContent) -> buildStartLiveItem(highlight, attributes)
+            else                             -> null
         }
     }
 
-    private fun isLiveRunning(liveLocationContent: LiveLocationBeaconContent): Boolean {
-        return liveLocationContent.getBestBeaconInfo()?.isLive.orFalse() && liveLocationContent.hasTimedOut.not()
+    private fun isLiveRunning(beaconInfoContent: MessageBeaconInfoContent): Boolean {
+        // TODO when we will use aggregatedSummary, check if the live has timed out as well
+        return beaconInfoContent.isLive.orFalse()
     }
 
     private fun buildStartLiveItem(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
index c21b67a459..aca2aab174 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
@@ -38,6 +38,8 @@ import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.content.EncryptionEventContent
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.getStateEvent
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
@@ -90,7 +92,8 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
                 2,
                 eventIdToHighlight,
                 partialState.rootThreadEventId,
-                partialState.isFromThreadTimeline())
+                partialState.isFromThreadTimeline()
+        )
         return if (mergedEvents.isEmpty()) {
             null
         } else {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
index 1787da2ae7..b960e2c6a9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
@@ -31,6 +31,7 @@ import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.files.LocalFilesHelper
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.time.Clock
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.core.utils.containsOnlyEmojis
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
@@ -98,8 +99,8 @@ import org.matrix.android.sdk.api.session.events.model.RelationType
 import org.matrix.android.sdk.api.session.events.model.content.EncryptedEventContent
 import org.matrix.android.sdk.api.session.events.model.isThread
 import org.matrix.android.sdk.api.session.events.model.toModel
-import org.matrix.android.sdk.api.session.room.model.livelocation.LiveLocationBeaconContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconInfoContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageContentWithFormattedBody
 import org.matrix.android.sdk.api.session.room.model.message.MessageEmoteContent
@@ -122,31 +123,32 @@ import org.matrix.android.sdk.api.util.MimeTypes
 import javax.inject.Inject
 
 class MessageItemFactory @Inject constructor(
-    private val localFilesHelper: LocalFilesHelper,
-    private val colorProvider: ColorProvider,
-    private val dimensionConverter: DimensionConverter,
-    private val timelineMediaSizeProvider: TimelineMediaSizeProvider,
-    private val htmlRenderer: Lazy<EventHtmlRenderer>,
-    private val htmlCompressor: VectorHtmlCompressor,
-    private val textRendererFactory: EventTextRenderer.Factory,
-    private val stringProvider: StringProvider,
-    private val imageContentRenderer: ImageContentRenderer,
-    private val messageInformationDataFactory: MessageInformationDataFactory,
-    private val messageItemAttributesFactory: MessageItemAttributesFactory,
-    private val contentUploadStateTrackerBinder: ContentUploadStateTrackerBinder,
-    private val contentDownloadStateTrackerBinder: ContentDownloadStateTrackerBinder,
-    private val defaultItemFactory: DefaultItemFactory,
-    private val noticeItemFactory: NoticeItemFactory,
-    private val avatarSizeProvider: AvatarSizeProvider,
-    private val pillsPostProcessorFactory: PillsPostProcessor.Factory,
-    private val lightweightSettingsStorage: LightweightSettingsStorage,
-    private val spanUtils: SpanUtils,
-    private val session: Session,
-    private val audioMessagePlaybackTracker: AudioMessagePlaybackTracker,
-    private val locationPinProvider: LocationPinProvider,
-    private val vectorPreferences: VectorPreferences,
-    private val urlMapProvider: UrlMapProvider,
-    private val liveLocationMessageItemFactory: LiveLocationMessageItemFactory,
+        private val localFilesHelper: LocalFilesHelper,
+        private val colorProvider: ColorProvider,
+        private val dimensionConverter: DimensionConverter,
+        private val timelineMediaSizeProvider: TimelineMediaSizeProvider,
+        private val htmlRenderer: Lazy<EventHtmlRenderer>,
+        private val htmlCompressor: VectorHtmlCompressor,
+        private val textRendererFactory: EventTextRenderer.Factory,
+        private val stringProvider: StringProvider,
+        private val imageContentRenderer: ImageContentRenderer,
+        private val messageInformationDataFactory: MessageInformationDataFactory,
+        private val messageItemAttributesFactory: MessageItemAttributesFactory,
+        private val contentUploadStateTrackerBinder: ContentUploadStateTrackerBinder,
+        private val contentDownloadStateTrackerBinder: ContentDownloadStateTrackerBinder,
+        private val defaultItemFactory: DefaultItemFactory,
+        private val noticeItemFactory: NoticeItemFactory,
+        private val avatarSizeProvider: AvatarSizeProvider,
+        private val pillsPostProcessorFactory: PillsPostProcessor.Factory,
+        private val lightweightSettingsStorage: LightweightSettingsStorage,
+        private val spanUtils: SpanUtils,
+        private val session: Session,
+        private val clock: Clock,
+        private val audioMessagePlaybackTracker: AudioMessagePlaybackTracker,
+        private val locationPinProvider: LocationPinProvider,
+        private val vectorPreferences: VectorPreferences,
+        private val urlMapProvider: UrlMapProvider,
+        private val liveLocationMessageItemFactory: LiveLocationMessageItemFactory,
 ) {
 
     // TODO inject this properly?
@@ -181,7 +183,7 @@ class MessageItemFactory @Inject constructor(
             return defaultItemFactory.create(malformedText, informationData, highlight, callback)
         }
         if (messageContent.relatesTo?.type == RelationType.REPLACE ||
-            event.isEncrypted() && event.root.content.toModel<EncryptedEventContent>()?.relatesTo?.type == RelationType.REPLACE
+                event.isEncrypted() && event.root.content.toModel<EncryptedEventContent>()?.relatesTo?.type == RelationType.REPLACE
         ) {
             // This is an edit event, we should display it when debugging as a notice event
             return noticeItemFactory.create(params)
@@ -198,24 +200,24 @@ class MessageItemFactory @Inject constructor(
         //        val all = event.root.toContent()
         //        val ev = all.toModel<Event>()
         val messageItem = when (messageContent) {
-            is MessageEmoteContent -> buildEmoteMessageItem(messageContent, informationData, highlight, callback, attributes)
-            is MessageTextContent -> buildItemForTextContent(messageContent, informationData, highlight, callback, attributes)
-            is MessageImageInfoContent -> buildImageMessageItem(messageContent, informationData, highlight, callback, attributes)
-            is MessageNoticeContent -> buildNoticeMessageItem(messageContent, informationData, highlight, callback, attributes)
-            is MessageVideoContent -> buildVideoMessageItem(messageContent, informationData, highlight, callback, attributes)
-            is MessageFileContent -> buildFileMessageItem(messageContent, highlight, attributes)
-            is MessageAudioContent -> buildAudioContent(params, messageContent, informationData, highlight, attributes)
+            is MessageEmoteContent               -> buildEmoteMessageItem(messageContent, informationData, highlight, callback, attributes)
+            is MessageTextContent                -> buildItemForTextContent(messageContent, informationData, highlight, callback, attributes)
+            is MessageImageInfoContent           -> buildImageMessageItem(messageContent, informationData, highlight, callback, attributes)
+            is MessageNoticeContent              -> buildNoticeMessageItem(messageContent, informationData, highlight, callback, attributes)
+            is MessageVideoContent               -> buildVideoMessageItem(messageContent, informationData, highlight, callback, attributes)
+            is MessageFileContent                -> buildFileMessageItem(messageContent, highlight, attributes)
+            is MessageAudioContent               -> buildAudioContent(params, messageContent, informationData, highlight, attributes)
             is MessageVerificationRequestContent -> buildVerificationRequestMessageItem(messageContent, informationData, highlight, callback, attributes)
-            is MessagePollContent -> buildPollItem(messageContent, informationData, highlight, callback, attributes)
-            is MessageLocationContent -> {
+            is MessagePollContent                -> buildPollItem(messageContent, informationData, highlight, callback, attributes)
+            is MessageLocationContent            -> {
                 if (vectorPreferences.labsRenderLocationsInTimeline()) {
                     buildLocationItem(messageContent, informationData, highlight, attributes)
                 } else {
                     buildMessageTextItem(messageContent.body, false, informationData, highlight, callback, attributes)
                 }
             }
-            is LiveLocationBeaconContent -> liveLocationMessageItemFactory.create(messageContent, highlight, attributes)
-            else -> buildNotHandledMessageItem(messageContent, informationData, highlight, callback, attributes)
+            is MessageBeaconInfoContent          -> liveLocationMessageItemFactory.create(messageContent, highlight, attributes)
+            else                                 -> buildNotHandledMessageItem(messageContent, informationData, highlight, callback, attributes)
         }
         return messageItem?.apply {
             layout(informationData.messageLayout.layoutRes)
@@ -223,10 +225,10 @@ class MessageItemFactory @Inject constructor(
     }
 
     private fun buildLocationItem(
-        locationContent: MessageLocationContent,
-        informationData: MessageInformationData,
-        highlight: Boolean,
-        attributes: AbsMessageItem.Attributes,
+            locationContent: MessageLocationContent,
+            informationData: MessageInformationData,
+            highlight: Boolean,
+            attributes: AbsMessageItem.Attributes,
     ): MessageLocationItem? {
         val width = timelineMediaSizeProvider.getMaxSize().first
         val height = dimensionConverter.dpToPx(MESSAGE_LOCATION_ITEM_HEIGHT_IN_DP)
@@ -238,22 +240,22 @@ class MessageItemFactory @Inject constructor(
         val userId = if (locationContent.isSelfLocation()) informationData.senderId else null
 
         return MessageLocationItem_()
-            .attributes(attributes)
-            .locationUrl(locationUrl)
-            .mapWidth(width)
-            .mapHeight(height)
-            .userId(userId)
-            .locationPinProvider(locationPinProvider)
-            .highlighted(highlight)
-            .leftGuideline(avatarSizeProvider.leftGuideline)
+                .attributes(attributes)
+                .locationUrl(locationUrl)
+                .mapWidth(width)
+                .mapHeight(height)
+                .userId(userId)
+                .locationPinProvider(locationPinProvider)
+                .highlighted(highlight)
+                .leftGuideline(avatarSizeProvider.leftGuideline)
     }
 
     private fun buildPollItem(
-        pollContent: MessagePollContent,
-        informationData: MessageInformationData,
-        highlight: Boolean,
-        callback: TimelineEventController.Callback?,
-        attributes: AbsMessageItem.Attributes,
+            pollContent: MessagePollContent,
+            informationData: MessageInformationData,
+            highlight: Boolean,
+            callback: TimelineEventController.Callback?,
+            attributes: AbsMessageItem.Attributes,
     ): PollItem {
         val pollResponseSummary = informationData.pollResponseAggregatedSummary
         val pollState = createPollState(informationData, pollResponseSummary, pollContent)
@@ -264,16 +266,16 @@ class MessageItemFactory @Inject constructor(
         val totalVotesText = createTotalVotesText(pollState, pollResponseSummary)
 
         return PollItem_()
-            .attributes(attributes)
-            .eventId(informationData.eventId)
-            .pollQuestion(question)
-            .canVote(pollState.isVotable())
-            .totalVotesText(totalVotesText)
-            .optionViewStates(optionViewStates)
-            .edited(informationData.hasBeenEdited)
-            .highlighted(highlight)
-            .leftGuideline(avatarSizeProvider.leftGuideline)
-            .callback(callback)
+                .attributes(attributes)
+                .eventId(informationData.eventId)
+                .pollQuestion(question)
+                .canVote(pollState.isVotable())
+                .totalVotesText(totalVotesText)
+                .optionViewStates(optionViewStates)
+                .edited(informationData.hasBeenEdited)
+                .highlighted(highlight)
+                .leftGuideline(avatarSizeProvider.leftGuideline)
+                .callback(callback)
     }
 
     private fun createPollState(
@@ -281,11 +283,11 @@ class MessageItemFactory @Inject constructor(
             pollResponseSummary: PollResponseData?,
             pollContent: MessagePollContent,
     ): PollState = when {
-        !informationData.sendState.isSent() -> Sending
-        pollResponseSummary?.isClosed.orFalse() -> Ended
+        !informationData.sendState.isSent()                                 -> Sending
+        pollResponseSummary?.isClosed.orFalse()                             -> Ended
         pollContent.getBestPollCreationInfo()?.kind == PollType.UNDISCLOSED -> Undisclosed
-        pollResponseSummary?.myVote?.isNotEmpty().orFalse() -> Voted(pollResponseSummary?.totalVotes ?: 0)
-        else -> Ready
+        pollResponseSummary?.myVote?.isNotEmpty().orFalse()                 -> Voted(pollResponseSummary?.totalVotes ?: 0)
+        else                                                                -> Ready
     }
 
     private fun List<PollAnswer>.mapToOptions(
@@ -303,11 +305,11 @@ class MessageItemFactory @Inject constructor(
         val isWinner = winnerVoteCount != 0 && voteCount == winnerVoteCount
 
         when (pollState) {
-            Sending -> PollSending(optionId, optionAnswer)
-            Ready -> PollReady(optionId, optionAnswer)
-            is Voted -> PollVoted(optionId, optionAnswer, voteCount, votePercentage, isMyVote)
+            Sending     -> PollSending(optionId, optionAnswer)
+            Ready       -> PollReady(optionId, optionAnswer)
+            is Voted    -> PollVoted(optionId, optionAnswer, voteCount, votePercentage, isMyVote)
             Undisclosed -> PollUndisclosed(optionId, optionAnswer, isMyVote)
-            Ended -> PollEnded(optionId, optionAnswer, voteCount, votePercentage, isWinner)
+            Ended       -> PollEnded(optionId, optionAnswer, voteCount, votePercentage, isWinner)
         }
     }
 
@@ -327,11 +329,11 @@ class MessageItemFactory @Inject constructor(
     ): String {
         val votes = pollResponseSummary?.totalVotes ?: 0
         return when {
-            pollState is Ended -> stringProvider.getQuantityString(R.plurals.poll_total_vote_count_after_ended, votes, votes)
+            pollState is Ended       -> stringProvider.getQuantityString(R.plurals.poll_total_vote_count_after_ended, votes, votes)
             pollState is Undisclosed -> ""
-            pollState is Voted -> stringProvider.getQuantityString(R.plurals.poll_total_vote_count_before_ended_and_voted, votes, votes)
-            votes == 0 -> stringProvider.getString(R.string.poll_no_votes_cast)
-            else -> stringProvider.getQuantityString(R.plurals.poll_total_vote_count_before_ended_and_not_voted, votes, votes)
+            pollState is Voted       -> stringProvider.getQuantityString(R.plurals.poll_total_vote_count_before_ended_and_voted, votes, votes)
+            votes == 0               -> stringProvider.getString(R.string.poll_no_votes_cast)
+            else                     -> stringProvider.getQuantityString(R.plurals.poll_total_vote_count_before_ended_and_not_voted, votes, votes)
         }
     }
 
@@ -406,27 +408,27 @@ class MessageItemFactory @Inject constructor(
         }
 
         return MessageVoiceItem_()
-            .attributes(attributes)
-            .duration(messageContent.audioWaveformInfo?.duration ?: 0)
-            .waveform(messageContent.audioWaveformInfo?.waveform?.toFft().orEmpty())
-            .playbackControlButtonClickListener(playbackControlButtonClickListener)
-            .waveformTouchListener(waveformTouchListener)
-            .audioMessagePlaybackTracker(audioMessagePlaybackTracker)
-            .isLocalFile(localFilesHelper.isLocalFile(fileUrl))
-            .mxcUrl(fileUrl)
-            .contentUploadStateTrackerBinder(contentUploadStateTrackerBinder)
-            .contentDownloadStateTrackerBinder(contentDownloadStateTrackerBinder)
-            .highlighted(highlight)
-            .leftGuideline(avatarSizeProvider.leftGuideline)
+                .attributes(attributes)
+                .duration(messageContent.audioWaveformInfo?.duration ?: 0)
+                .waveform(messageContent.audioWaveformInfo?.waveform?.toFft().orEmpty())
+                .playbackControlButtonClickListener(playbackControlButtonClickListener)
+                .waveformTouchListener(waveformTouchListener)
+                .audioMessagePlaybackTracker(audioMessagePlaybackTracker)
+                .isLocalFile(localFilesHelper.isLocalFile(fileUrl))
+                .mxcUrl(fileUrl)
+                .contentUploadStateTrackerBinder(contentUploadStateTrackerBinder)
+                .contentDownloadStateTrackerBinder(contentDownloadStateTrackerBinder)
+                .highlighted(highlight)
+                .leftGuideline(avatarSizeProvider.leftGuideline)
     }
 
     private fun buildVerificationRequestMessageItem(
-        messageContent: MessageVerificationRequestContent,
-        @Suppress("UNUSED_PARAMETER")
-        informationData: MessageInformationData,
-        highlight: Boolean,
-        callback: TimelineEventController.Callback?,
-        attributes: AbsMessageItem.Attributes,
+            messageContent: MessageVerificationRequestContent,
+            @Suppress("UNUSED_PARAMETER")
+            informationData: MessageInformationData,
+            highlight: Boolean,
+            callback: TimelineEventController.Callback?,
+            attributes: AbsMessageItem.Attributes,
     ): VerificationRequestItem? {
         // If this request is not sent by me or sent to me, we should ignore it in timeline
         val myUserId = session.myUserId
@@ -436,49 +438,50 @@ class MessageItemFactory @Inject constructor(
 
         val otherUserId = if (informationData.sentByMe) messageContent.toUserId else informationData.senderId
         val otherUserName = if (informationData.sentByMe) {
-            session.getRoomMember(messageContent.toUserId, roomId)?.displayName
+            session.roomService().getRoomMember(messageContent.toUserId, roomId)?.displayName
         } else {
             informationData.memberName
         }
         return VerificationRequestItem_()
-            .attributes(
-                VerificationRequestItem.Attributes(
-                    otherUserId = otherUserId,
-                    otherUserName = otherUserName.toString(),
-                    referenceId = informationData.eventId,
-                    informationData = informationData,
-                    avatarRenderer = attributes.avatarRenderer,
-                    messageColorProvider = attributes.messageColorProvider,
-                    itemLongClickListener = attributes.itemLongClickListener,
-                    itemClickListener = attributes.itemClickListener,
-                    reactionPillCallback = attributes.reactionPillCallback,
-                    readReceiptsCallback = attributes.readReceiptsCallback,
-                    emojiTypeFace = attributes.emojiTypeFace,
-                    reactionsSummaryEvents = attributes.reactionsSummaryEvents,
+                .attributes(
+                        VerificationRequestItem.Attributes(
+                                otherUserId = otherUserId,
+                                otherUserName = otherUserName.toString(),
+                                referenceId = informationData.eventId,
+                                informationData = informationData,
+                                avatarRenderer = attributes.avatarRenderer,
+                                messageColorProvider = attributes.messageColorProvider,
+                                itemLongClickListener = attributes.itemLongClickListener,
+                                itemClickListener = attributes.itemClickListener,
+                                reactionPillCallback = attributes.reactionPillCallback,
+                                readReceiptsCallback = attributes.readReceiptsCallback,
+                                emojiTypeFace = attributes.emojiTypeFace,
+                                reactionsSummaryEvents = attributes.reactionsSummaryEvents,
+                        )
                 )
-            )
-            .callback(callback)
-            .highlighted(highlight)
-            .leftGuideline(avatarSizeProvider.leftGuideline)
+                .clock(clock)
+                .callback(callback)
+                .highlighted(highlight)
+                .leftGuideline(avatarSizeProvider.leftGuideline)
     }
 
     private fun buildFileMessageItem(
-        messageContent: MessageFileContent,
-        highlight: Boolean,
-        attributes: AbsMessageItem.Attributes,
+            messageContent: MessageFileContent,
+            highlight: Boolean,
+            attributes: AbsMessageItem.Attributes,
     ): MessageFileItem {
         val mxcUrl = messageContent.getFileUrl() ?: ""
         return MessageFileItem_()
-            .attributes(attributes)
-            .leftGuideline(avatarSizeProvider.leftGuideline)
-            .isLocalFile(localFilesHelper.isLocalFile(messageContent.getFileUrl()))
-            .isDownloaded(session.fileService().isFileInCache(messageContent))
-            .mxcUrl(mxcUrl)
-            .contentUploadStateTrackerBinder(contentUploadStateTrackerBinder)
-            .contentDownloadStateTrackerBinder(contentDownloadStateTrackerBinder)
-            .highlighted(highlight)
-            .filename(messageContent.body)
-            .iconRes(R.drawable.ic_paperclip)
+                .attributes(attributes)
+                .leftGuideline(avatarSizeProvider.leftGuideline)
+                .isLocalFile(localFilesHelper.isLocalFile(messageContent.getFileUrl()))
+                .isDownloaded(session.fileService().isFileInCache(messageContent))
+                .mxcUrl(mxcUrl)
+                .contentUploadStateTrackerBinder(contentUploadStateTrackerBinder)
+                .contentDownloadStateTrackerBinder(contentDownloadStateTrackerBinder)
+                .highlighted(highlight)
+                .filename(messageContent.body)
+                .iconRes(R.drawable.ic_paperclip)
     }
 
     private fun buildAudioContent(
@@ -488,10 +491,10 @@ class MessageItemFactory @Inject constructor(
             highlight: Boolean,
             attributes: AbsMessageItem.Attributes,
     ) = if (messageContent.voiceMessageIndicator != null) {
-                buildVoiceMessageItem(params, messageContent, informationData, highlight, attributes)
-            } else {
-                buildAudioMessageItem(params, messageContent, informationData, highlight, attributes)
-            }
+        buildVoiceMessageItem(params, messageContent, informationData, highlight, attributes)
+    } else {
+        buildAudioMessageItem(params, messageContent, informationData, highlight, attributes)
+    }
 
     private fun buildNotHandledMessageItem(
             messageContent: MessageContent,
@@ -504,95 +507,95 @@ class MessageItemFactory @Inject constructor(
     }
 
     private fun buildImageMessageItem(
-        messageContent: MessageImageInfoContent,
-        @Suppress("UNUSED_PARAMETER")
-        informationData: MessageInformationData,
-        highlight: Boolean,
-        callback: TimelineEventController.Callback?,
-        attributes: AbsMessageItem.Attributes,
+            messageContent: MessageImageInfoContent,
+            @Suppress("UNUSED_PARAMETER")
+            informationData: MessageInformationData,
+            highlight: Boolean,
+            callback: TimelineEventController.Callback?,
+            attributes: AbsMessageItem.Attributes,
     ): MessageImageVideoItem? {
         val (maxWidth, maxHeight) = timelineMediaSizeProvider.getMaxSize()
         val data = ImageContentRenderer.Data(
-            eventId = informationData.eventId,
-            filename = messageContent.body,
-            mimeType = messageContent.mimeType,
-            url = messageContent.getFileUrl(),
-            elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt(),
-            height = messageContent.info?.height,
-            maxHeight = maxHeight,
-            width = messageContent.info?.width,
-            maxWidth = maxWidth,
-            allowNonMxcUrls = informationData.sendState.isSending()
+                eventId = informationData.eventId,
+                filename = messageContent.body,
+                mimeType = messageContent.mimeType,
+                url = messageContent.getFileUrl(),
+                elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt(),
+                height = messageContent.info?.height,
+                maxHeight = maxHeight,
+                width = messageContent.info?.width,
+                maxWidth = maxWidth,
+                allowNonMxcUrls = informationData.sendState.isSending()
         )
         return MessageImageVideoItem_()
-            .attributes(attributes)
-            .leftGuideline(avatarSizeProvider.leftGuideline)
-            .imageContentRenderer(imageContentRenderer)
-            .contentUploadStateTrackerBinder(contentUploadStateTrackerBinder)
-            .playable(messageContent.mimeType == MimeTypes.Gif)
-            .highlighted(highlight)
-            .mediaData(data)
-            .apply {
-                if (messageContent.msgType == MessageType.MSGTYPE_STICKER_LOCAL) {
-                    mode(ImageContentRenderer.Mode.STICKER)
-                    clickListener { view ->
-                        callback?.onImageMessageClicked(messageContent, data, view, listOf(data))
-                    }
-                } else {
-                    clickListener { view ->
-                        callback?.onImageMessageClicked(messageContent, data, view, emptyList())
+                .attributes(attributes)
+                .leftGuideline(avatarSizeProvider.leftGuideline)
+                .imageContentRenderer(imageContentRenderer)
+                .contentUploadStateTrackerBinder(contentUploadStateTrackerBinder)
+                .playable(messageContent.mimeType == MimeTypes.Gif)
+                .highlighted(highlight)
+                .mediaData(data)
+                .apply {
+                    if (messageContent.msgType == MessageType.MSGTYPE_STICKER_LOCAL) {
+                        mode(ImageContentRenderer.Mode.STICKER)
+                        clickListener { view ->
+                            callback?.onImageMessageClicked(messageContent, data, view, listOf(data))
+                        }
+                    } else {
+                        clickListener { view ->
+                            callback?.onImageMessageClicked(messageContent, data, view, emptyList())
+                        }
                     }
                 }
-            }
     }
 
     private fun buildVideoMessageItem(
-        messageContent: MessageVideoContent,
-        informationData: MessageInformationData,
-        highlight: Boolean,
-        callback: TimelineEventController.Callback?,
-        attributes: AbsMessageItem.Attributes,
+            messageContent: MessageVideoContent,
+            informationData: MessageInformationData,
+            highlight: Boolean,
+            callback: TimelineEventController.Callback?,
+            attributes: AbsMessageItem.Attributes,
     ): MessageImageVideoItem? {
         val (maxWidth, maxHeight) = timelineMediaSizeProvider.getMaxSize()
         val thumbnailData = ImageContentRenderer.Data(
-            eventId = informationData.eventId,
-            filename = messageContent.body,
-            mimeType = messageContent.mimeType,
-            url = messageContent.videoInfo?.getThumbnailUrl(),
-            elementToDecrypt = messageContent.videoInfo?.thumbnailFile?.toElementToDecrypt(),
-            height = messageContent.videoInfo?.height,
-            maxHeight = maxHeight,
-            width = messageContent.videoInfo?.width,
-            maxWidth = maxWidth,
-            allowNonMxcUrls = informationData.sendState.isSending()
+                eventId = informationData.eventId,
+                filename = messageContent.body,
+                mimeType = messageContent.mimeType,
+                url = messageContent.videoInfo?.getThumbnailUrl(),
+                elementToDecrypt = messageContent.videoInfo?.thumbnailFile?.toElementToDecrypt(),
+                height = messageContent.videoInfo?.height,
+                maxHeight = maxHeight,
+                width = messageContent.videoInfo?.width,
+                maxWidth = maxWidth,
+                allowNonMxcUrls = informationData.sendState.isSending()
         )
 
         val videoData = VideoContentRenderer.Data(
-            eventId = informationData.eventId,
-            filename = messageContent.body,
-            mimeType = messageContent.mimeType,
-            url = messageContent.getFileUrl(),
-            elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt(),
-            thumbnailMediaData = thumbnailData
+                eventId = informationData.eventId,
+                filename = messageContent.body,
+                mimeType = messageContent.mimeType,
+                url = messageContent.getFileUrl(),
+                elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt(),
+                thumbnailMediaData = thumbnailData
         )
 
         return MessageImageVideoItem_()
-            .leftGuideline(avatarSizeProvider.leftGuideline)
-            .attributes(attributes)
-            .imageContentRenderer(imageContentRenderer)
-            .contentUploadStateTrackerBinder(contentUploadStateTrackerBinder)
-            .playable(true)
-            .highlighted(highlight)
-            .mediaData(thumbnailData)
-            .clickListener { view -> callback?.onVideoMessageClicked(messageContent, videoData, view.findViewById(R.id.messageThumbnailView)) }
+                .leftGuideline(avatarSizeProvider.leftGuideline)
+                .attributes(attributes)
+                .imageContentRenderer(imageContentRenderer)
+                .contentUploadStateTrackerBinder(contentUploadStateTrackerBinder)
+                .playable(true)
+                .highlighted(highlight)
+                .mediaData(thumbnailData)
+                .clickListener { view -> callback?.onVideoMessageClicked(messageContent, videoData, view.findViewById(R.id.messageThumbnailView)) }
     }
 
     private fun buildItemForTextContent(
-        messageContent: MessageTextContent,
-        informationData: MessageInformationData,
-        highlight: Boolean,
-        callback: TimelineEventController.Callback?,
-        attributes: AbsMessageItem.Attributes,
+            messageContent: MessageTextContent,
+            informationData: MessageInformationData,
+            highlight: Boolean,
+            callback: TimelineEventController.Callback?,
+            attributes: AbsMessageItem.Attributes,
     ): VectorEpoxyModel<*>? {
         val matrixFormattedBody = messageContent.matrixFormattedBody
         return if (matrixFormattedBody != null) {
@@ -603,11 +606,11 @@ class MessageItemFactory @Inject constructor(
     }
 
     private fun buildFormattedTextItem(
-        matrixFormattedBody: String,
-        informationData: MessageInformationData,
-        highlight: Boolean,
-        callback: TimelineEventController.Callback?,
-        attributes: AbsMessageItem.Attributes,
+            matrixFormattedBody: String,
+            informationData: MessageInformationData,
+            highlight: Boolean,
+            callback: TimelineEventController.Callback?,
+            attributes: AbsMessageItem.Attributes,
     ): MessageTextItem? {
         val compressed = htmlCompressor.compress(matrixFormattedBody)
         val renderedFormattedBody = htmlRenderer.get().render(compressed, pillsPostProcessor) as Spanned
@@ -615,42 +618,42 @@ class MessageItemFactory @Inject constructor(
     }
 
     private fun buildMessageTextItem(
-        body: CharSequence,
-        isFormatted: Boolean,
-        informationData: MessageInformationData,
-        highlight: Boolean,
-        callback: TimelineEventController.Callback?,
-        attributes: AbsMessageItem.Attributes,
+            body: CharSequence,
+            isFormatted: Boolean,
+            informationData: MessageInformationData,
+            highlight: Boolean,
+            callback: TimelineEventController.Callback?,
+            attributes: AbsMessageItem.Attributes,
     ): MessageTextItem? {
         val renderedBody = textRenderer.render(body)
         val bindingOptions = spanUtils.getBindingOptions(renderedBody)
         val linkifiedBody = renderedBody.linkify(callback)
 
         return MessageTextItem_()
-            .message(
-                if (informationData.hasBeenEdited) {
-                    annotateWithEdited(linkifiedBody, callback, informationData)
-                } else {
-                    linkifiedBody
-                }.toEpoxyCharSequence()
-            )
-            .useBigFont(linkifiedBody.length <= MAX_NUMBER_OF_EMOJI_FOR_BIG_FONT * 2 && containsOnlyEmojis(linkifiedBody.toString()))
-            .bindingOptions(bindingOptions)
-            .markwonPlugins(htmlRenderer.get().plugins)
-            .searchForPills(isFormatted)
-            .previewUrlRetriever(callback?.getPreviewUrlRetriever())
-            .imageContentRenderer(imageContentRenderer)
-            .previewUrlCallback(callback)
-            .leftGuideline(avatarSizeProvider.leftGuideline)
-            .attributes(attributes)
-            .highlighted(highlight)
-            .movementMethod(createLinkMovementMethod(callback))
+                .message(
+                        if (informationData.hasBeenEdited) {
+                            annotateWithEdited(linkifiedBody, callback, informationData)
+                        } else {
+                            linkifiedBody
+                        }.toEpoxyCharSequence()
+                )
+                .useBigFont(linkifiedBody.length <= MAX_NUMBER_OF_EMOJI_FOR_BIG_FONT * 2 && containsOnlyEmojis(linkifiedBody.toString()))
+                .bindingOptions(bindingOptions)
+                .markwonPlugins(htmlRenderer.get().plugins)
+                .searchForPills(isFormatted)
+                .previewUrlRetriever(callback?.getPreviewUrlRetriever())
+                .imageContentRenderer(imageContentRenderer)
+                .previewUrlCallback(callback)
+                .leftGuideline(avatarSizeProvider.leftGuideline)
+                .attributes(attributes)
+                .highlighted(highlight)
+                .movementMethod(createLinkMovementMethod(callback))
     }
 
     private fun annotateWithEdited(
-        linkifiedBody: CharSequence,
-        callback: TimelineEventController.Callback?,
-        informationData: MessageInformationData,
+            linkifiedBody: CharSequence,
+            callback: TimelineEventController.Callback?,
+            informationData: MessageInformationData,
     ): Spannable {
         val spannable = SpannableStringBuilder()
         spannable.append(linkifiedBody)
@@ -660,40 +663,44 @@ class MessageItemFactory @Inject constructor(
         val editStart = spannable.lastIndexOf(editedSuffix)
         val editEnd = editStart + editedSuffix.length
         spannable.setSpan(
-            ForegroundColorSpan(color),
-            editStart,
-            editEnd,
-            Spanned.SPAN_INCLUSIVE_EXCLUSIVE)
+                ForegroundColorSpan(color),
+                editStart,
+                editEnd,
+                Spanned.SPAN_INCLUSIVE_EXCLUSIVE
+        )
 
         // Note: text size is set to 14sp
         spannable.setSpan(
-            AbsoluteSizeSpan(dimensionConverter.spToPx(13)),
-            editStart,
-            editEnd,
-            Spanned.SPAN_INCLUSIVE_EXCLUSIVE)
+                AbsoluteSizeSpan(dimensionConverter.spToPx(13)),
+                editStart,
+                editEnd,
+                Spanned.SPAN_INCLUSIVE_EXCLUSIVE
+        )
 
-        spannable.setSpan(object : ClickableSpan() {
-            override fun onClick(widget: View) {
-                callback?.onEditedDecorationClicked(informationData)
-            }
+        spannable.setSpan(
+                object : ClickableSpan() {
+                    override fun onClick(widget: View) {
+                        callback?.onEditedDecorationClicked(informationData)
+                    }
 
-            override fun updateDrawState(ds: TextPaint) {
-                // nop
-            }
-        },
-            editStart,
-            editEnd,
-            Spanned.SPAN_INCLUSIVE_EXCLUSIVE)
+                    override fun updateDrawState(ds: TextPaint) {
+                        // nop
+                    }
+                },
+                editStart,
+                editEnd,
+                Spanned.SPAN_INCLUSIVE_EXCLUSIVE
+        )
         return spannable
     }
 
     private fun buildNoticeMessageItem(
-        messageContent: MessageNoticeContent,
-        @Suppress("UNUSED_PARAMETER")
-        informationData: MessageInformationData,
-        highlight: Boolean,
-        callback: TimelineEventController.Callback?,
-        attributes: AbsMessageItem.Attributes,
+            messageContent: MessageNoticeContent,
+            @Suppress("UNUSED_PARAMETER")
+            informationData: MessageInformationData,
+            highlight: Boolean,
+            callback: TimelineEventController.Callback?,
+            attributes: AbsMessageItem.Attributes,
     ): MessageTextItem? {
         val htmlBody = messageContent.getHtmlBody()
         val formattedBody = span {
@@ -706,23 +713,23 @@ class MessageItemFactory @Inject constructor(
         val message = formattedBody.linkify(callback)
 
         return MessageTextItem_()
-            .leftGuideline(avatarSizeProvider.leftGuideline)
-            .previewUrlRetriever(callback?.getPreviewUrlRetriever())
-            .imageContentRenderer(imageContentRenderer)
-            .previewUrlCallback(callback)
-            .attributes(attributes)
-            .message(message.toEpoxyCharSequence())
-            .bindingOptions(bindingOptions)
-            .highlighted(highlight)
-            .movementMethod(createLinkMovementMethod(callback))
+                .leftGuideline(avatarSizeProvider.leftGuideline)
+                .previewUrlRetriever(callback?.getPreviewUrlRetriever())
+                .imageContentRenderer(imageContentRenderer)
+                .previewUrlCallback(callback)
+                .attributes(attributes)
+                .message(message.toEpoxyCharSequence())
+                .bindingOptions(bindingOptions)
+                .highlighted(highlight)
+                .movementMethod(createLinkMovementMethod(callback))
     }
 
     private fun buildEmoteMessageItem(
-        messageContent: MessageEmoteContent,
-        informationData: MessageInformationData,
-        highlight: Boolean,
-        callback: TimelineEventController.Callback?,
-        attributes: AbsMessageItem.Attributes,
+            messageContent: MessageEmoteContent,
+            informationData: MessageInformationData,
+            highlight: Boolean,
+            callback: TimelineEventController.Callback?,
+            attributes: AbsMessageItem.Attributes,
     ): MessageTextItem? {
         val formattedBody = SpannableStringBuilder()
         formattedBody.append("* ${informationData.memberName} ")
@@ -731,48 +738,48 @@ class MessageItemFactory @Inject constructor(
         val message = formattedBody.linkify(callback)
 
         return MessageTextItem_()
-            .message(
-                if (informationData.hasBeenEdited) {
-                    annotateWithEdited(message, callback, informationData)
-                } else {
-                    message
-                }.toEpoxyCharSequence()
-            )
-            .bindingOptions(bindingOptions)
-            .leftGuideline(avatarSizeProvider.leftGuideline)
-            .previewUrlRetriever(callback?.getPreviewUrlRetriever())
-            .imageContentRenderer(imageContentRenderer)
-            .previewUrlCallback(callback)
-            .attributes(attributes)
-            .highlighted(highlight)
-            .movementMethod(createLinkMovementMethod(callback))
+                .message(
+                        if (informationData.hasBeenEdited) {
+                            annotateWithEdited(message, callback, informationData)
+                        } else {
+                            message
+                        }.toEpoxyCharSequence()
+                )
+                .bindingOptions(bindingOptions)
+                .leftGuideline(avatarSizeProvider.leftGuideline)
+                .previewUrlRetriever(callback?.getPreviewUrlRetriever())
+                .imageContentRenderer(imageContentRenderer)
+                .previewUrlCallback(callback)
+                .attributes(attributes)
+                .highlighted(highlight)
+                .movementMethod(createLinkMovementMethod(callback))
     }
 
     private fun MessageContentWithFormattedBody.getHtmlBody(): CharSequence {
         return matrixFormattedBody
-            ?.let { htmlCompressor.compress(it) }
-            ?.let { htmlRenderer.get().render(it, pillsPostProcessor) }
+                ?.let { htmlCompressor.compress(it) }
+                ?.let { htmlRenderer.get().render(it, pillsPostProcessor) }
                 ?: body
     }
 
     private fun buildRedactedItem(
-        attributes: AbsMessageItem.Attributes,
-        highlight: Boolean,
+            attributes: AbsMessageItem.Attributes,
+            highlight: Boolean,
     ): RedactedMessageItem? {
         return RedactedMessageItem_()
-            .layout(attributes.informationData.messageLayout.layoutRes)
-            .leftGuideline(avatarSizeProvider.leftGuideline)
-            .attributes(attributes)
-            .highlighted(highlight)
+                .layout(attributes.informationData.messageLayout.layoutRes)
+                .leftGuideline(avatarSizeProvider.leftGuideline)
+                .attributes(attributes)
+                .highlighted(highlight)
     }
 
     private fun List<Int?>?.toFft(): List<Int>? {
         return this
-            ?.filterNotNull()
-            ?.map {
-                // Value comes from AudioWaveformView.MAX_FFT, and 1024 is the max value in the Matrix spec
-                it * AudioWaveformView.MAX_FFT / 1024
-            }
+                ?.filterNotNull()
+                ?.map {
+                    // Value comes from AudioWaveformView.MAX_FFT, and 1024 is the max value in the Matrix spec
+                    it * AudioWaveformView.MAX_FFT / 1024
+                }
     }
 
     companion object {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineFactory.kt
index 3ec1366131..5d2f69eee4 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineFactory.kt
@@ -22,6 +22,7 @@ import im.vector.app.features.home.room.detail.timeline.merged.MergedTimelines
 import kotlinx.coroutines.CoroutineScope
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import javax.inject.Inject
@@ -44,18 +45,18 @@ class TimelineFactory @Inject constructor(private val session: Session, private
         val settings = timelineSettingsFactory.create(rootThreadEventId)
 
         if (!session.vectorCallService.protocolChecker.supportVirtualRooms) {
-            return mainRoom.createTimeline(eventId, settings)
+            return mainRoom.timelineService().createTimeline(eventId, settings)
         }
         val virtualRoomId = session.vectorCallService.userMapper.virtualRoomForNativeRoom(mainRoom.roomId)
         return if (virtualRoomId == null) {
-            mainRoom.createTimeline(eventId, settings)
+            mainRoom.timelineService().createTimeline(eventId, settings)
         } else {
             val virtualRoom = session.getRoom(virtualRoomId)!!
             MergedTimelines(
                     coroutineScope = coroutineScope,
-                    mainTimeline = mainRoom.createTimeline(eventId, settings),
+                    mainTimeline = mainRoom.timelineService().createTimeline(eventId, settings),
                     secondaryTimelineParams = MergedTimelines.SecondaryTimelineParams(
-                            timeline = virtualRoom.createTimeline(null, settings),
+                            timeline = virtualRoom.timelineService().createTimeline(null, settings),
                             shouldFilterTypes = true,
                             allowedTypes = secondaryTimelineAllowedTypes
                     )
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
index b5d620658e..f4bcc1ba65 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
@@ -50,13 +50,15 @@ class TimelineItemFactory @Inject constructor(
                             timelineEvent = event,
                             highlightedEventId = params.highlightedEventId,
                             isFromThreadTimeline = params.isFromThreadTimeline(),
-                            rootThreadEventId = params.rootThreadEventId)) {
+                            rootThreadEventId = params.rootThreadEventId
+                    )) {
                 return buildEmptyItem(
                         event,
                         params.prevEvent,
                         params.highlightedEventId,
                         params.rootThreadEventId,
-                        params.isFromThreadTimeline())
+                        params.isFromThreadTimeline()
+                )
             }
 
             // Manage state event differently, to check validity
@@ -151,7 +153,8 @@ class TimelineItemFactory @Inject constructor(
                 params.prevEvent,
                 params.highlightedEventId,
                 params.rootThreadEventId,
-                params.isFromThreadTimeline())
+                params.isFromThreadTimeline()
+        )
     }
 
     private fun buildEmptyItem(timelineEvent: TimelineEvent,
@@ -163,7 +166,8 @@ class TimelineItemFactory @Inject constructor(
                 timelineEvent = prevEvent,
                 highlightedEventId = highlightedEventId,
                 isFromThreadTimeline = isFromThreadTimeline,
-                rootThreadEventId = rootThreadEventId)
+                rootThreadEventId = rootThreadEventId
+        )
         return TimelineEmptyItem_()
                 .id(timelineEvent.localId)
                 .eventId(timelineEvent.eventId)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
index fb8f8fce9d..ecd80297fc 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
@@ -32,6 +32,8 @@ import org.matrix.android.sdk.api.session.crypto.verification.safeValueOf
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.RelationType
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.api.session.room.model.message.MessageRelationContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationCancelContent
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
index 51dc26247c..7ad0cb27c6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@@ -276,11 +276,15 @@ class NoticeEventFormatter @Inject constructor(
 
         val historyVisibilitySuffix = roomHistoryVisibilityFormatter.getNoticeSuffix(historyVisibility)
         return if (event.isSentByCurrentUser()) {
-            sp.getString(if (isDm) R.string.notice_made_future_direct_room_visibility_by_you else R.string.notice_made_future_room_visibility_by_you,
-                    historyVisibilitySuffix)
+            sp.getString(
+                    if (isDm) R.string.notice_made_future_direct_room_visibility_by_you else R.string.notice_made_future_room_visibility_by_you,
+                    historyVisibilitySuffix
+            )
         } else {
-            sp.getString(if (isDm) R.string.notice_made_future_direct_room_visibility else R.string.notice_made_future_room_visibility,
-                    senderName, historyVisibilitySuffix)
+            sp.getString(
+                    if (isDm) R.string.notice_made_future_direct_room_visibility else R.string.notice_made_future_room_visibility,
+                    senderName, historyVisibilitySuffix
+            )
         }
     }
 
@@ -298,20 +302,27 @@ class NoticeEventFormatter @Inject constructor(
                             } else {
                                 R.string.notice_room_third_party_revoked_invite_by_you
                             },
-                            prevContent.displayName)
+                            prevContent.displayName
+                    )
                 } else {
-                    sp.getString(if (isDm) R.string.notice_direct_room_third_party_revoked_invite else R.string.notice_room_third_party_revoked_invite,
-                            senderName, prevContent.displayName)
+                    sp.getString(
+                            if (isDm) R.string.notice_direct_room_third_party_revoked_invite else R.string.notice_room_third_party_revoked_invite,
+                            senderName, prevContent.displayName
+                    )
                 }
             }
             content != null     -> {
                 // Invitation case
                 if (event.isSentByCurrentUser()) {
-                    sp.getString(if (isDm) R.string.notice_direct_room_third_party_invite_by_you else R.string.notice_room_third_party_invite_by_you,
-                            content.displayName)
+                    sp.getString(
+                            if (isDm) R.string.notice_direct_room_third_party_invite_by_you else R.string.notice_room_third_party_invite_by_you,
+                            content.displayName
+                    )
                 } else {
-                    sp.getString(if (isDm) R.string.notice_direct_room_third_party_invite else R.string.notice_room_third_party_invite,
-                            senderName, content.displayName)
+                    sp.getString(
+                            if (isDm) R.string.notice_direct_room_third_party_invite else R.string.notice_room_third_party_invite,
+                            senderName, content.displayName
+                    )
                 }
             }
             else                -> null
@@ -416,19 +427,21 @@ class NoticeEventFormatter @Inject constructor(
 
         return buildString {
             // Title
-            append(if (prevEventContent == null) {
-                if (event.isSentByCurrentUser()) {
-                    sp.getString(R.string.notice_room_server_acl_set_title_by_you)
-                } else {
-                    sp.getString(R.string.notice_room_server_acl_set_title, senderName)
-                }
-            } else {
-                if (event.isSentByCurrentUser()) {
-                    sp.getString(R.string.notice_room_server_acl_updated_title_by_you)
-                } else {
-                    sp.getString(R.string.notice_room_server_acl_updated_title, senderName)
-                }
-            })
+            append(
+                    if (prevEventContent == null) {
+                        if (event.isSentByCurrentUser()) {
+                            sp.getString(R.string.notice_room_server_acl_set_title_by_you)
+                        } else {
+                            sp.getString(R.string.notice_room_server_acl_set_title, senderName)
+                        }
+                    } else {
+                        if (event.isSentByCurrentUser()) {
+                            sp.getString(R.string.notice_room_server_acl_updated_title_by_you)
+                        } else {
+                            sp.getString(R.string.notice_room_server_acl_updated_title, senderName)
+                        }
+                    }
+            )
             if (eventContent.allowList.isEmpty()) {
                 // Special case for stuck room
                 appendNl(sp.getString(R.string.notice_room_server_acl_allow_is_empty))
@@ -562,8 +575,10 @@ class NoticeEventFormatter @Inject constructor(
                             if (isDm) R.string.notice_direct_room_guest_access_can_join_by_you else R.string.notice_room_guest_access_can_join_by_you
                     )
                 } else {
-                    sp.getString(if (isDm) R.string.notice_direct_room_guest_access_can_join else R.string.notice_room_guest_access_can_join,
-                            senderName)
+                    sp.getString(
+                            if (isDm) R.string.notice_direct_room_guest_access_can_join else R.string.notice_room_guest_access_can_join,
+                            senderName
+                    )
                 }
             GuestAccess.Forbidden ->
                 if (event.isSentByCurrentUser()) {
@@ -571,8 +586,10 @@ class NoticeEventFormatter @Inject constructor(
                             if (isDm) R.string.notice_direct_room_guest_access_forbidden_by_you else R.string.notice_room_guest_access_forbidden_by_you
                     )
                 } else {
-                    sp.getString(if (isDm) R.string.notice_direct_room_guest_access_forbidden else R.string.notice_room_guest_access_forbidden,
-                            senderName)
+                    sp.getString(
+                            if (isDm) R.string.notice_direct_room_guest_access_forbidden else R.string.notice_room_guest_access_forbidden,
+                            senderName
+                    )
                 }
             else                  -> null
         }
@@ -705,18 +722,24 @@ class NoticeEventFormatter @Inject constructor(
             Membership.JOIN   ->
                 eventContent.safeReason?.let { reason ->
                     if (event.isSentByCurrentUser()) {
-                        sp.getString(if (isDm) R.string.notice_direct_room_join_with_reason_by_you else R.string.notice_room_join_with_reason_by_you,
-                                reason)
+                        sp.getString(
+                                if (isDm) R.string.notice_direct_room_join_with_reason_by_you else R.string.notice_room_join_with_reason_by_you,
+                                reason
+                        )
                     } else {
-                        sp.getString(if (isDm) R.string.notice_direct_room_join_with_reason else R.string.notice_room_join_with_reason,
-                                senderDisplayName, reason)
+                        sp.getString(
+                                if (isDm) R.string.notice_direct_room_join_with_reason else R.string.notice_room_join_with_reason,
+                                senderDisplayName, reason
+                        )
                     }
                 } ?: run {
                     if (event.isSentByCurrentUser()) {
                         sp.getString(if (isDm) R.string.notice_direct_room_join_by_you else R.string.notice_room_join_by_you)
                     } else {
-                        sp.getString(if (isDm) R.string.notice_direct_room_join else R.string.notice_room_join,
-                                senderDisplayName)
+                        sp.getString(
+                                if (isDm) R.string.notice_direct_room_join else R.string.notice_room_join,
+                                senderDisplayName
+                        )
                     }
                 }
             Membership.LEAVE  ->
@@ -745,15 +768,19 @@ class NoticeEventFormatter @Inject constructor(
                                             reason
                                     )
                                 } else {
-                                    sp.getString(if (isDm) R.string.notice_direct_room_leave_with_reason else R.string.notice_room_leave_with_reason,
-                                            senderDisplayName, reason)
+                                    sp.getString(
+                                            if (isDm) R.string.notice_direct_room_leave_with_reason else R.string.notice_room_leave_with_reason,
+                                            senderDisplayName, reason
+                                    )
                                 }
                             } ?: run {
                                 if (event.isSentByCurrentUser()) {
                                     sp.getString(if (isDm) R.string.notice_direct_room_leave_by_you else R.string.notice_room_leave_by_you)
                                 } else {
-                                    sp.getString(if (isDm) R.string.notice_direct_room_leave else R.string.notice_room_leave,
-                                            senderDisplayName)
+                                    sp.getString(
+                                            if (isDm) R.string.notice_direct_room_leave else R.string.notice_room_leave,
+                                            senderDisplayName
+                                    )
                                 }
                             }
                     }
@@ -824,8 +851,10 @@ class NoticeEventFormatter @Inject constructor(
                 if (event.isSentByCurrentUser()) {
                     sp.getString(if (isDm) R.string.direct_room_join_rules_invite_by_you else R.string.room_join_rules_invite_by_you)
                 } else {
-                    sp.getString(if (isDm) R.string.direct_room_join_rules_invite else R.string.room_join_rules_invite,
-                            senderName)
+                    sp.getString(
+                            if (isDm) R.string.direct_room_join_rules_invite else R.string.room_join_rules_invite,
+                            senderName
+                    )
                 }
             RoomJoinRules.PUBLIC ->
                 if (event.isSentByCurrentUser()) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt
index 14769bc95b..c1ba085fd7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt
@@ -25,20 +25,24 @@ class RoomHistoryVisibilityFormatter @Inject constructor(
         private val stringProvider: StringProvider
 ) {
     fun getNoticeSuffix(roomHistoryVisibility: RoomHistoryVisibility): String {
-        return stringProvider.getString(when (roomHistoryVisibility) {
-            RoomHistoryVisibility.WORLD_READABLE -> R.string.notice_room_visibility_world_readable
-            RoomHistoryVisibility.SHARED         -> R.string.notice_room_visibility_shared
-            RoomHistoryVisibility.INVITED        -> R.string.notice_room_visibility_invited
-            RoomHistoryVisibility.JOINED         -> R.string.notice_room_visibility_joined
-        })
+        return stringProvider.getString(
+                when (roomHistoryVisibility) {
+                    RoomHistoryVisibility.WORLD_READABLE -> R.string.notice_room_visibility_world_readable
+                    RoomHistoryVisibility.SHARED         -> R.string.notice_room_visibility_shared
+                    RoomHistoryVisibility.INVITED        -> R.string.notice_room_visibility_invited
+                    RoomHistoryVisibility.JOINED         -> R.string.notice_room_visibility_joined
+                }
+        )
     }
 
     fun getSetting(roomHistoryVisibility: RoomHistoryVisibility): String {
-        return stringProvider.getString(when (roomHistoryVisibility) {
-            RoomHistoryVisibility.WORLD_READABLE -> R.string.room_settings_read_history_entry_anyone
-            RoomHistoryVisibility.SHARED         -> R.string.room_settings_read_history_entry_members_only_option_time_shared
-            RoomHistoryVisibility.INVITED        -> R.string.room_settings_read_history_entry_members_only_invited
-            RoomHistoryVisibility.JOINED         -> R.string.room_settings_read_history_entry_members_only_joined
-        })
+        return stringProvider.getString(
+                when (roomHistoryVisibility) {
+                    RoomHistoryVisibility.WORLD_READABLE -> R.string.room_settings_read_history_entry_anyone
+                    RoomHistoryVisibility.SHARED         -> R.string.room_settings_read_history_entry_members_only_option_time_shared
+                    RoomHistoryVisibility.INVITED        -> R.string.room_settings_read_history_entry_members_only_invited
+                    RoomHistoryVisibility.JOINED         -> R.string.room_settings_read_history_entry_members_only_joined
+                }
+        )
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
index 9ff8ddfbce..b8882b3f47 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
@@ -156,9 +156,11 @@ private class ContentMediaProgressUpdater(private val progressLayout: ViewGroup,
         progressBar.isIndeterminate = false
         progressBar.progress = percent.toInt()
         progressTextView.isVisible = true
-        progressTextView.text = progressLayout.context.getString(resId,
+        progressTextView.text = progressLayout.context.getString(
+                resId,
                 TextUtils.formatFileSize(progressLayout.context, current, true),
-                TextUtils.formatFileSize(progressLayout.context, total, true))
+                TextUtils.formatFileSize(progressLayout.context, total, true)
+        )
         progressTextView.setTextColor(messageColorProvider.getMessageTextColor(SendState.SENDING))
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/LocationPinProvider.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/LocationPinProvider.kt
index 7262284c95..8ef910c931 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/LocationPinProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/LocationPinProvider.kt
@@ -29,6 +29,7 @@ import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.glide.GlideApp
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.getUser
 import org.matrix.android.sdk.api.util.toMatrixItem
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
index 8a0e1e18fd..e9361e564c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
@@ -25,6 +25,7 @@ import im.vector.app.features.home.room.detail.timeline.item.DaySeparatorItem
 import im.vector.app.features.home.room.detail.timeline.item.ItemWithEvents
 import im.vector.app.features.home.room.detail.timeline.item.TimelineReadMarkerItem_
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
+import kotlin.random.Random
 import kotlin.reflect.KMutableProperty0
 
 private const val DEFAULT_PREFETCH_THRESHOLD = 30
@@ -104,7 +105,7 @@ class TimelineControllerInterceptorHelper(private val positionOfReadMarker: KMut
                     .coerceAtLeast(0)
 
             val loadingItem = LoadingItem_()
-                    .id("prefetch_backward_loading${System.currentTimeMillis()}")
+                    .id("prefetch_backward_loading${Random.nextLong()}")
                     .showLoader(false)
                     .setVisibilityStateChangedListener(Timeline.Direction.BACKWARDS, callback)
 
@@ -120,7 +121,7 @@ class TimelineControllerInterceptorHelper(private val positionOfReadMarker: KMut
                     .coerceAtLeast(0)
 
             val loadingItem = LoadingItem_()
-                    .id("prefetch_forward_loading${System.currentTimeMillis()}")
+                    .id("prefetch_forward_loading${Random.nextLong()}")
                     .showLoader(false)
                     .setVisibilityStateChangedListener(Timeline.Direction.FORWARDS, callback)
             add(indexOfPrefetchForward, loadingItem)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineVisibilityStateChangedListeners.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineVisibilityStateChangedListeners.kt
index 2337a6ea15..95feef83c0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineVisibilityStateChangedListeners.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineVisibilityStateChangedListeners.kt
@@ -22,7 +22,7 @@ import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 
 class ReadMarkerVisibilityStateChangedListener(private val callback: TimelineEventController.Callback?) :
-    VectorEpoxyModel.OnVisibilityStateChangedListener {
+        VectorEpoxyModel.OnVisibilityStateChangedListener {
 
     override fun onVisibilityStateChanged(visibilityState: Int) {
         if (visibilityState == VisibilityState.VISIBLE) {
@@ -33,7 +33,7 @@ class ReadMarkerVisibilityStateChangedListener(private val callback: TimelineEve
 
 class TimelineEventVisibilityStateChangedListener(private val callback: TimelineEventController.Callback?,
                                                   private val event: TimelineEvent) :
-    VectorEpoxyModel.OnVisibilityStateChangedListener {
+        VectorEpoxyModel.OnVisibilityStateChangedListener {
 
     override fun onVisibilityStateChanged(visibilityState: Int) {
         if (visibilityState == VisibilityState.VISIBLE) {
@@ -46,7 +46,7 @@ class TimelineEventVisibilityStateChangedListener(private val callback: Timeline
 
 class MergedTimelineEventVisibilityStateChangedListener(private val callback: TimelineEventController.Callback?,
                                                         private val events: List<TimelineEvent>) :
-    VectorEpoxyModel.OnVisibilityStateChangedListener {
+        VectorEpoxyModel.OnVisibilityStateChangedListener {
 
     override fun onVisibilityStateChanged(visibilityState: Int) {
         if (visibilityState == VisibilityState.VISIBLE) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt
index ea130901b1..b56f5264e6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt
@@ -209,13 +209,13 @@ abstract class CallTileTimelineItem : AbsBaseMessageItem<CallTileTimelineItem.Ho
             attributes.callKind == CallKind.CONFERENCE -> {
                 holder.statusView.setStatus(R.string.call_tile_video_active)
             }
-            attributes.informationData.sentByMe -> {
+            attributes.informationData.sentByMe        -> {
                 holder.statusView.setStatus(R.string.call_ringing)
             }
-            attributes.callKind.isVoiceCall     -> {
+            attributes.callKind.isVoiceCall            -> {
                 holder.statusView.setStatus(R.string.call_tile_voice_incoming)
             }
-            else                                -> {
+            else                                       -> {
                 holder.statusView.setStatus(R.string.call_tile_video_incoming)
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageAudioItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageAudioItem.kt
index 3c071578cc..f574dcfdcb 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageAudioItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageAudioItem.kt
@@ -127,9 +127,11 @@ abstract class MessageAudioItem : AbsMessageItem<MessageAudioItem.Holder>() {
                         (duration * (progress.toFloat() / 100)).toInt()
                 )
             }
+
             override fun onStartTrackingTouch(seekBar: SeekBar) {
                 isUserSeeking = true
             }
+
             override fun onStopTrackingTouch(seekBar: SeekBar) {
                 isUserSeeking = false
                 val percentage = seekBar.progress.toFloat() / 100
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
index 02937574f2..82860da886 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
@@ -126,9 +126,9 @@ abstract class MessageVoiceItem : AbsMessageItem<MessageVoiceItem.Holder>() {
         audioMessagePlaybackTracker.track(attributes.informationData.eventId, object : AudioMessagePlaybackTracker.Listener {
             override fun onUpdate(state: AudioMessagePlaybackTracker.Listener.State) {
                 when (state) {
-                    is AudioMessagePlaybackTracker.Listener.State.Idle    -> renderIdleState(holder, waveformColorIdle, waveformColorPlayed)
-                    is AudioMessagePlaybackTracker.Listener.State.Playing -> renderPlayingState(holder, state, waveformColorIdle, waveformColorPlayed)
-                    is AudioMessagePlaybackTracker.Listener.State.Paused  -> renderPausedState(holder, state, waveformColorIdle, waveformColorPlayed)
+                    is AudioMessagePlaybackTracker.Listener.State.Idle      -> renderIdleState(holder, waveformColorIdle, waveformColorPlayed)
+                    is AudioMessagePlaybackTracker.Listener.State.Playing   -> renderPlayingState(holder, state, waveformColorIdle, waveformColorPlayed)
+                    is AudioMessagePlaybackTracker.Listener.State.Paused    -> renderPausedState(holder, state, waveformColorIdle, waveformColorPlayed)
                     is AudioMessagePlaybackTracker.Listener.State.Recording -> Unit
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/StatusTileTimelineItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/StatusTileTimelineItem.kt
index 2d9119f14c..3810f1cb6f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/StatusTileTimelineItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/StatusTileTimelineItem.kt
@@ -57,7 +57,7 @@ abstract class StatusTileTimelineItem : AbsBaseMessageItem<StatusTileTimelineIte
             ShieldUIState.GREEN -> R.drawable.ic_shield_trusted
             ShieldUIState.BLACK -> R.drawable.ic_shield_black
             ShieldUIState.RED   -> R.drawable.ic_shield_warning
-            ShieldUIState.ERROR   -> R.drawable.ic_warning_badge
+            ShieldUIState.ERROR -> R.drawable.ic_warning_badge
         }
 
         holder.titleView.setCompoundDrawablesWithIntrinsicBounds(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt
index 0e6530fdca..fc4c55d1f3 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt
@@ -31,6 +31,7 @@ import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
 import im.vector.app.core.epoxy.ClickListener
 import im.vector.app.core.epoxy.onClick
+import im.vector.app.core.time.Clock
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.RoomDetailAction
 import im.vector.app.features.home.room.detail.timeline.MessageColorProvider
@@ -47,6 +48,9 @@ abstract class VerificationRequestItem : AbsBaseMessageItem<VerificationRequestI
     @EpoxyAttribute
     lateinit var attributes: Attributes
 
+    @EpoxyAttribute
+    lateinit var clock: Clock
+
     @EpoxyAttribute
     var callback: TimelineEventController.Callback? = null
 
@@ -107,7 +111,7 @@ abstract class VerificationRequestItem : AbsBaseMessageItem<VerificationRequestI
         }
 
         // Always hide buttons if request is too old
-        if (!VerificationService.isValidRequest(attributes.informationData.ageLocalTS)) {
+        if (!VerificationService.isValidRequest(attributes.informationData.ageLocalTS, clock.epochMillis())) {
             holder.buttonBar.isVisible = false
         }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/merged/MergedTimelines.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/merged/MergedTimelines.kt
index 55e0cce9f7..a517aab720 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/merged/MergedTimelines.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/merged/MergedTimelines.kt
@@ -81,14 +81,16 @@ class MergedTimelines(
                 timeline = mainTimeline,
                 wrappedListener = listener,
                 shouldFilterTypes = false,
-                allowedTypes = emptyList()) {
+                allowedTypes = emptyList()
+        ) {
             processTimelineUpdates(::mainIsInit, mainTimelineEvents, it)
         }
         val secondaryTimelineListener = ListenerInterceptor(
                 timeline = secondaryTimeline,
                 wrappedListener = listener,
                 shouldFilterTypes = secondaryTimelineParams.shouldFilterTypes,
-                allowedTypes = secondaryTimelineParams.allowedTypes) {
+                allowedTypes = secondaryTimelineParams.allowedTypes
+        ) {
             processTimelineUpdates(::secondaryIsInit, secondaryTimelineEvents, it)
         }
         listenersMapping[listener] = listOf(mainTimelineListener, secondaryTimelineListener)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt
index 6ae3cd227f..57b2f2fd40 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt
@@ -82,11 +82,13 @@ class ViewReactionsBottomSheet :
     companion object {
         fun newInstance(roomId: String, informationData: MessageInformationData): ViewReactionsBottomSheet {
             return ViewReactionsBottomSheet().apply {
-                setArguments(TimelineEventFragmentArgs(
-                        eventId = informationData.eventId,
-                        roomId = roomId,
-                        informationData = informationData
-                ))
+                setArguments(
+                        TimelineEventFragmentArgs(
+                                eventId = informationData.eventId,
+                                roomId = roomId,
+                                informationData = informationData
+                        )
+                )
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt
index 29b8c207df..deb22bbe04 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt
@@ -33,6 +33,8 @@ import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.home.room.detail.timeline.action.TimelineEventFragmentArgs
 import kotlinx.coroutines.flow.map
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.flow.flow
 import org.matrix.android.sdk.flow.unwrap
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/render/EventTextRenderer.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/render/EventTextRenderer.kt
index d50a6fb297..83cffc4279 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/render/EventTextRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/render/EventTextRenderer.kt
@@ -62,7 +62,7 @@ class EventTextRenderer @AssistedInject constructor(@Assisted private val roomId
      * ========================================================================================== */
 
     private fun addNotifyEveryoneSpans(text: Spannable, roomId: String) {
-        val room: RoomSummary? = sessionHolder.getSafeActiveSession()?.getRoomSummary(roomId)
+        val room: RoomSummary? = sessionHolder.getSafeActiveSession()?.roomService()?.getRoomSummary(roomId)
         val matrixItem = MatrixItem.EveryoneInRoomItem(
                 id = roomId,
                 avatarUrl = room?.avatarUrl,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
index ae9b004f6c..a41732be2a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
@@ -29,11 +29,11 @@ sealed interface TimelineMessageLayout : Parcelable {
 
     @Parcelize
     data class Default(
-        override val showAvatar: Boolean,
-        override val showDisplayName: Boolean,
-        override val showTimestamp: Boolean,
-        // Keep defaultLayout generated on epoxy items
-        override val layoutRes: Int = 0,
+            override val showAvatar: Boolean,
+            override val showDisplayName: Boolean,
+            override val showTimestamp: Boolean,
+            // Keep defaultLayout generated on epoxy items
+            override val layoutRes: Int = 0,
     ) : TimelineMessageLayout
 
     @Parcelize
@@ -56,10 +56,10 @@ sealed interface TimelineMessageLayout : Parcelable {
 
         @Parcelize
         data class CornersRadius(
-            val topStartRadius: Float,
-            val topEndRadius: Float,
-            val bottomStartRadius: Float,
-            val bottomEndRadius: Float,
+                val topStartRadius: Float,
+                val topEndRadius: Float,
+                val bottomStartRadius: Float,
+                val bottomEndRadius: Float,
         ) : Parcelable
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
index f2334e5a4f..f083c70100 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
@@ -59,12 +59,12 @@ class TimelineMessageLayoutFactory @Inject constructor(private val session: Sess
                 MessageType.MSGTYPE_VIDEO,
                 MessageType.MSGTYPE_STICKER_LOCAL,
                 MessageType.MSGTYPE_EMOTE,
-                MessageType.MSGTYPE_LIVE_LOCATION_STATE,
+                MessageType.MSGTYPE_BEACON_INFO,
         )
         private val MSG_TYPES_WITH_TIMESTAMP_INSIDE_MESSAGE = setOf(
                 MessageType.MSGTYPE_IMAGE,
                 MessageType.MSGTYPE_VIDEO,
-                MessageType.MSGTYPE_LIVE_LOCATION_STATE,
+                MessageType.MSGTYPE_BEACON_INFO,
         )
     }
 
@@ -95,6 +95,7 @@ class TimelineMessageLayoutFactory @Inject constructor(private val session: Sess
                 nextDisplayableEvent.root.getClearType() !in listOf(EventType.MESSAGE, EventType.STICKER, EventType.ENCRYPTED) ||
                 isNextMessageReceivedMoreThanOneHourAgo ||
                 isTileTypeMessage(nextDisplayableEvent) ||
+                nextDisplayableEvent.isRootThread() ||
                 event.isRootThread() ||
                 nextDisplayableEvent.isEdition()
 
@@ -151,9 +152,9 @@ class TimelineMessageLayoutFactory @Inject constructor(private val session: Sess
 
     private fun MessageContent?.shouldAddMessageOverlay(): Boolean {
         return when {
-            this == null || msgType == MessageType.MSGTYPE_LIVE_LOCATION_STATE -> false
-            msgType == MessageType.MSGTYPE_LOCATION                            -> vectorPreferences.labsRenderLocationsInTimeline()
-            else                                                               -> msgType in MSG_TYPES_WITH_TIMESTAMP_INSIDE_MESSAGE
+            this == null || msgType == MessageType.MSGTYPE_BEACON_INFO -> false
+            msgType == MessageType.MSGTYPE_LOCATION                    -> vectorPreferences.labsRenderLocationsInTimeline()
+            else                                                       -> msgType in MSG_TYPES_WITH_TIMESTAMP_INSIDE_MESSAGE
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt
index 87ed9243a5..c9665a9125 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt
@@ -91,7 +91,8 @@ class MessageBubbleView @JvmOverloads constructor(
             background = RippleDrawable(
                     ContextCompat.getColorStateList(context, R.color.mtrl_btn_ripple_color) ?: ColorStateList.valueOf(Color.TRANSPARENT),
                     bubbleDrawable,
-                    rippleMaskDrawable)
+                    rippleMaskDrawable
+            )
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/MigrateRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/MigrateRoomViewModel.kt
index 98be65c167..50eecb90fb 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/MigrateRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/MigrateRoomViewModel.kt
@@ -29,19 +29,21 @@ import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.session.coroutineScope
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.getRoomSummary
 
 class MigrateRoomViewModel @AssistedInject constructor(
         @Assisted initialState: MigrateRoomViewState,
         private val session: Session,
         private val upgradeRoomViewModelTask: UpgradeRoomViewModelTask) :
-    VectorViewModel<MigrateRoomViewState, MigrateRoomAction, EmptyViewEvents>(initialState) {
+        VectorViewModel<MigrateRoomViewState, MigrateRoomAction, EmptyViewEvents>(initialState) {
 
     init {
         val room = session.getRoom(initialState.roomId)
         val summary = session.getRoomSummary(initialState.roomId)
         setState {
             copy(
-                    currentVersion = room?.getRoomVersion(),
+                    currentVersion = room?.roomVersionService()?.getRoomVersion(),
                     isPublic = summary?.isPublic ?: false,
                     otherMemberCount = summary?.otherMemberIds?.count() ?: 0,
                     knownParents = summary?.flattenParentIds ?: emptyList()
@@ -58,7 +60,7 @@ class MigrateRoomViewModel @AssistedInject constructor(
 
     override fun handle(action: MigrateRoomAction) {
         when (action) {
-            is MigrateRoomAction.SetAutoInvite             -> {
+            is MigrateRoomAction.SetAutoInvite -> {
                 setState {
                     copy(shouldIssueInvites = action.autoInvite)
                 }
@@ -68,7 +70,7 @@ class MigrateRoomViewModel @AssistedInject constructor(
                     copy(shouldUpdateKnownParents = action.update)
                 }
             }
-            MigrateRoomAction.UpgradeRoom                  -> {
+            MigrateRoomAction.UpgradeRoom -> {
                 handleUpgradeRoom()
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/UpgradeRoomViewModelTask.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/UpgradeRoomViewModelTask.kt
index 8859aaeacf..2f91b9a35a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/UpgradeRoomViewModelTask.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/UpgradeRoomViewModelTask.kt
@@ -20,6 +20,7 @@ import im.vector.app.core.platform.ViewModelTask
 import im.vector.app.core.resources.StringProvider
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoom
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -49,12 +50,12 @@ class UpgradeRoomViewModelTask @Inject constructor(
 
         val room = session.getRoom(params.roomId)
                 ?: return Result.UnknownRoom
-        if (!room.userMayUpgradeRoom(session.myUserId)) {
+        if (!room.roomVersionService().userMayUpgradeRoom(session.myUserId)) {
             return Result.NotAllowed
         }
 
         val updatedRoomId = try {
-            room.upgradeToVersion(params.newVersion)
+            room.roomVersionService().upgradeToVersion(params.newVersion)
         } catch (failure: Throwable) {
             return Result.ErrorFailure(failure)
         }
@@ -64,7 +65,7 @@ class UpgradeRoomViewModelTask @Inject constructor(
         params.userIdsToAutoInvite.forEach {
             params.progressReporter?.invoke(false, currentStep, totalStep)
             tryOrNull {
-                session.getRoom(updatedRoomId)?.invite(it)
+                session.getRoom(updatedRoomId)?.membershipService()?.invite(it)
             }
             currentStep++
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsController.kt
index b2da3bfc78..87392c5d7a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsController.kt
@@ -32,7 +32,7 @@ import javax.inject.Inject
 class RoomWidgetsController @Inject constructor(
         val stringProvider: StringProvider,
         val colorProvider: ColorProvider) :
-    TypedEpoxyController<List<Widget>>() {
+        TypedEpoxyController<List<Widget>>() {
 
     var listener: Listener? = null
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/CollapsableTypedEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/CollapsableTypedEpoxyController.kt
index 15b3602766..8cf7e6bcab 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/CollapsableTypedEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/CollapsableTypedEpoxyController.kt
@@ -19,7 +19,7 @@ package im.vector.app.features.home.room.list
 import com.airbnb.epoxy.EpoxyController
 
 abstract class CollapsableTypedEpoxyController<T> :
-    EpoxyController(), CollapsableControllerExtension {
+        EpoxyController(), CollapsableControllerExtension {
 
     private var currentData: T? = null
     private var allowModelBuildRequests = false
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
index aaa469f68d..2be6130a5d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
@@ -44,12 +44,14 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.resources.UserPreferencesProvider
 import im.vector.app.databinding.FragmentRoomListBinding
 import im.vector.app.features.analytics.plan.MobileScreen
+import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.home.RoomListDisplayMode
 import im.vector.app.features.home.room.filtered.FilteredRoomFooterItem
 import im.vector.app.features.home.room.list.actions.RoomListQuickActionsBottomSheet
 import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedAction
 import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel
 import im.vector.app.features.home.room.list.widget.NotifsFabMenuView
+import im.vector.app.features.matrixto.OriginOfMatrixTo
 import im.vector.app.features.notifications.NotificationDrawerManager
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.launchIn
@@ -179,7 +181,7 @@ class RoomListFragment @Inject constructor(
     }
 
     private fun handleShowMxToLink(link: String) {
-        navigator.openMatrixToBottomSheet(requireContext(), link)
+        navigator.openMatrixToBottomSheet(requireContext(), link, OriginOfMatrixTo.ROOM_LIST)
     }
 
     override fun onDestroyView() {
@@ -196,7 +198,12 @@ class RoomListFragment @Inject constructor(
     }
 
     private fun handleSelectRoom(event: RoomListViewEvents.SelectRoom, isInviteAlreadyAccepted: Boolean) {
-        navigator.openRoom(context = requireActivity(), roomId = event.roomSummary.roomId, isInviteAlreadyAccepted = isInviteAlreadyAccepted)
+        navigator.openRoom(
+                context = requireActivity(),
+                roomId = event.roomSummary.roomId,
+                isInviteAlreadyAccepted = isInviteAlreadyAccepted,
+                trigger = ViewRoom.Trigger.RoomList
+        )
     }
 
     private fun setupCreateRoomButton() {
@@ -474,7 +481,8 @@ class RoomListFragment @Inject constructor(
                     StateView.State.Empty(
                             title = getString(R.string.room_list_catchup_empty_title),
                             image = ContextCompat.getDrawable(requireContext(), R.drawable.ic_noun_party_popper),
-                            message = getString(R.string.room_list_catchup_empty_body))
+                            message = getString(R.string.room_list_catchup_empty_body)
+                    )
                 }
                 RoomListDisplayMode.PEOPLE        ->
                     StateView.State.Empty(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
index bd43a83f2c..80c7b4e921 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
@@ -70,11 +70,11 @@ class RoomListSectionBuilderGroup(
                         },
                         { qpm ->
                             val name = stringProvider.getString(R.string.bottom_action_rooms)
-                            val updatableFilterLivePageResult = session.getFilteredPagedRoomSummariesLive(qpm)
+                            val updatableFilterLivePageResult = session.roomService().getFilteredPagedRoomSummariesLive(qpm)
                             onUpdatable(updatableFilterLivePageResult)
 
                             val itemCountFlow = updatableFilterLivePageResult.livePagedList.asFlow()
-                                    .flatMapLatest { session.getRoomCountLive(updatableFilterLivePageResult.queryParams).asFlow() }
+                                    .flatMapLatest { session.roomService().getRoomCountLive(updatableFilterLivePageResult.queryParams).asFlow() }
                                     .distinctUntilChanged()
 
                             sections.add(
@@ -197,7 +197,8 @@ class RoomListSectionBuilderGroup(
             actualGroupId: String?
     ) {
         if (autoAcceptInvites.showInvites()) {
-            addSection(sections,
+            addSection(
+                    sections,
                     activeSpaceAwareQueries,
                     R.string.invitations_header,
                     true
@@ -252,7 +253,7 @@ class RoomListSectionBuilderGroup(
                            query: (RoomSummaryQueryParams.Builder) -> Unit) {
         withQueryParams(query) { roomQueryParams ->
             val name = stringProvider.getString(nameRes)
-            session.getFilteredPagedRoomSummariesLive(roomQueryParams)
+            session.roomService().getFilteredPagedRoomSummariesLive(roomQueryParams)
                     .also {
                         activeSpaceUpdaters.add(it)
                     }.livePagedList
@@ -262,7 +263,7 @@ class RoomListSectionBuilderGroup(
                                 .onEach {
                                     sections.find { it.sectionName == name }
                                             ?.notificationCount
-                                            ?.postValue(session.getNotificationCountForRooms(roomQueryParams))
+                                            ?.postValue(session.roomService().getNotificationCountForRooms(roomQueryParams))
                                 }
                                 .flowOn(Dispatchers.Default)
                                 .launchIn(coroutineScope)
@@ -272,7 +273,7 @@ class RoomListSectionBuilderGroup(
                                         sectionName = name,
                                         livePages = livePagedList,
                                         notifyOfLocalEcho = notifyOfLocalEcho,
-                                        itemCount = session.getRoomCountLive(roomQueryParams).asFlow()
+                                        itemCount = session.roomService().getRoomCountLive(roomQueryParams).asFlow()
                                 )
                         )
                     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
index d405bc5b6f..59137ec490 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
@@ -47,6 +47,7 @@ import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.query.RoomTagQueryFilter
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
 import org.matrix.android.sdk.api.session.room.model.Membership
@@ -324,11 +325,11 @@ class RoomListSectionBuilderSpace(
                 },
                 { qpm ->
                     val name = stringProvider.getString(R.string.bottom_action_rooms)
-                    val updatableFilterLivePageResult = session.getFilteredPagedRoomSummariesLive(qpm)
+                    val updatableFilterLivePageResult = session.roomService().getFilteredPagedRoomSummariesLive(qpm)
                     onUpdatable(updatableFilterLivePageResult)
 
                     val itemCountFlow = updatableFilterLivePageResult.livePagedList.asFlow()
-                            .flatMapLatest { session.getRoomCountLive(updatableFilterLivePageResult.queryParams).asFlow() }
+                            .flatMapLatest { session.roomService().getRoomCountLive(updatableFilterLivePageResult.queryParams).asFlow() }
                             .distinctUntilChanged()
 
                     sections.add(
@@ -354,13 +355,13 @@ class RoomListSectionBuilderSpace(
             val liveQueryParams = MutableStateFlow(updatedQueryParams)
             val itemCountFlow = liveQueryParams
                     .flatMapLatest {
-                        session.getRoomCountLive(it).asFlow()
+                        session.roomService().getRoomCountLive(it).asFlow()
                     }
                     .flowOn(Dispatchers.Main)
                     .distinctUntilChanged()
 
             val name = stringProvider.getString(nameRes)
-            val filteredPagedRoomSummariesLive = session.getFilteredPagedRoomSummariesLive(
+            val filteredPagedRoomSummariesLive = session.roomService().getFilteredPagedRoomSummariesLive(
                     roomQueryParams.process(spaceFilterStrategy, appStateHandler.safeActiveSpaceId()),
                     pagedListConfig
             )
@@ -407,7 +408,7 @@ class RoomListSectionBuilderSpace(
                                         if (countRoomAsNotif) {
                                             RoomAggregateNotificationCount(it.size, it.size)
                                         } else {
-                                            session.getNotificationCountForRooms(
+                                            session.roomService().getNotificationCountForRooms(
                                                     roomQueryParams.process(spaceFilterStrategy, appStateHandler.safeActiveSpaceId())
                                             )
                                         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index 70974bc1f6..9fd6de1a74 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -32,6 +32,8 @@ import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.analytics.AnalyticsTracker
+import im.vector.app.features.analytics.extensions.toAnalyticsJoinedRoom
+import im.vector.app.features.analytics.plan.JoinedRoom
 import im.vector.app.features.displayname.getBestName
 import im.vector.app.features.invite.AutoAcceptInvites
 import im.vector.app.features.settings.VectorPreferences
@@ -42,6 +44,8 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
@@ -166,7 +170,7 @@ class RoomListViewModel @AssistedInject constructor(
     }
 
     fun isPublicRoom(roomId: String): Boolean {
-        return session.getRoom(roomId)?.isPublic().orFalse()
+        return session.getRoom(roomId)?.stateService()?.isPublic().orFalse()
     }
 
     // PRIVATE METHODS *****************************************************************************
@@ -233,7 +237,7 @@ class RoomListViewModel @AssistedInject constructor(
 
         viewModelScope.launch {
             try {
-                session.leaveRoom(roomId)
+                session.roomService().leaveRoom(roomId)
                 // We do not update the rejectingRoomsIds here, because, the room is not rejected yet regarding the sync data.
                 // Instead, we wait for the room to be rejected
                 // Known bug: if the user is invited again (after rejecting the first invitation), the loading will be displayed instead of the buttons.
@@ -250,7 +254,7 @@ class RoomListViewModel @AssistedInject constructor(
         if (room != null) {
             viewModelScope.launch {
                 try {
-                    room.setRoomNotificationState(action.notificationState)
+                    room.roomPushRuleService().setRoomNotificationState(action.notificationState)
                 } catch (failure: Exception) {
                     _viewEvents.post(RoomListViewEvents.Failure(failure))
                 }
@@ -265,7 +269,7 @@ class RoomListViewModel @AssistedInject constructor(
 
         viewModelScope.launch {
             try {
-                session.joinRoom(action.roomId, null, action.viaServers ?: emptyList())
+                session.roomService().joinRoom(action.roomId, null, action.viaServers ?: emptyList())
 
                 suggestedRoomJoiningState.postValue(suggestedRoomJoiningState.value.orEmpty().toMutableMap().apply {
                     this[action.roomId] = Success(Unit)
@@ -275,6 +279,8 @@ class RoomListViewModel @AssistedInject constructor(
                     this[action.roomId] = Fail(failure)
                 }.toMap())
             }
+            session.getRoomSummary(action.roomId)
+                    ?.let { analyticsTracker.capture(it.toAnalyticsJoinedRoom(JoinedRoom.Trigger.RoomDirectory)) }
         }
     }
 
@@ -293,13 +299,13 @@ class RoomListViewModel @AssistedInject constructor(
                         action.tag.otherTag()
                                 ?.takeIf { room.roomSummary()?.hasTag(it).orFalse() }
                                 ?.let { tagToRemove ->
-                                    room.deleteTag(tagToRemove)
+                                    room.tagsService().deleteTag(tagToRemove)
                                 }
 
                         // Set the tag. We do not handle the order for the moment
-                        room.addTag(action.tag, 0.5)
+                        room.tagsService().addTag(action.tag, 0.5)
                     } else {
-                        room.deleteTag(action.tag)
+                        room.tagsService().deleteTag(action.tag)
                     }
                 } catch (failure: Throwable) {
                     _viewEvents.post(RoomListViewEvents.Failure(failure))
@@ -319,7 +325,7 @@ class RoomListViewModel @AssistedInject constructor(
     private fun handleLeaveRoom(action: RoomListAction.LeaveRoom) {
         _viewEvents.post(RoomListViewEvents.Loading(null))
         viewModelScope.launch {
-            val value = runCatching { session.leaveRoom(action.roomId) }
+            val value = runCatching { session.roomService().leaveRoom(action.roomId) }
                     .fold({ RoomListViewEvents.Done }, { RoomListViewEvents.Failure(it) })
             _viewEvents.post(value)
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceChildInfoItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceChildInfoItem.kt
index 99cbd45294..a2cb905f1b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceChildInfoItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceChildInfoItem.kt
@@ -40,7 +40,7 @@ import me.gujun.android.span.image
 import me.gujun.android.span.span
 import org.matrix.android.sdk.api.util.MatrixItem
 
-@EpoxyModelClass(layout = R.layout.item_suggested_room)
+@EpoxyModelClass(layout = R.layout.item_explore_space_child)
 abstract class SpaceChildInfoItem : VectorEpoxyModel<SpaceChildInfoItem.Holder>() {
 
     @EpoxyAttribute lateinit var avatarRenderer: AvatarRenderer
@@ -51,6 +51,7 @@ abstract class SpaceChildInfoItem : VectorEpoxyModel<SpaceChildInfoItem.Holder>(
 
     @EpoxyAttribute var memberCount: Int = 0
     @EpoxyAttribute var loading: Boolean = false
+    @EpoxyAttribute var suggested: Boolean = false
 
     @EpoxyAttribute var buttonLabel: String? = null
     @EpoxyAttribute var errorLabel: String? = null
@@ -89,6 +90,7 @@ abstract class SpaceChildInfoItem : VectorEpoxyModel<SpaceChildInfoItem.Holder>(
             }
         }
 
+        holder.suggestedTag.visibility = if (suggested) View.VISIBLE else View.GONE
         holder.joinButton.text = buttonLabel
 
         if (loading) {
@@ -121,7 +123,8 @@ abstract class SpaceChildInfoItem : VectorEpoxyModel<SpaceChildInfoItem.Holder>(
         val titleView by bind<TextView>(R.id.roomNameView)
         val joinButton by bind<Button>(R.id.joinSuggestedRoomButton)
         val joinButtonLoading by bind<ProgressBar>(R.id.joinSuggestedLoading)
-        val descriptionText by bind<TextView>(R.id.suggestedRoomDescription)
+        val descriptionText by bind<TextView>(R.id.roomDescription)
+        val suggestedTag by bind<TextView>(R.id.suggestedTag)
         val avatarImageView by bind<ImageView>(R.id.roomAvatarImageView)
         val rootView by bind<ViewGroup>(R.id.itemRoomLayout)
         val errorTextView by bind<TextView>(R.id.inlineErrorText)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt
index 2d61da0dd5..21fbd8b914 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt
@@ -25,7 +25,7 @@ sealed class RoomListQuickActionsSharedAction(
         @StringRes val titleRes: Int,
         @DrawableRes val iconResId: Int?,
         val destructive: Boolean = false) :
-    VectorSharedAction {
+        VectorSharedAction {
 
     data class NotificationsAllNoisy(val roomId: String) : RoomListQuickActionsSharedAction(
             R.string.room_list_quick_actions_notifications_all_noisy,
@@ -54,11 +54,13 @@ sealed class RoomListQuickActionsSharedAction(
 
     data class LowPriority(val roomId: String) : RoomListQuickActionsSharedAction(
             R.string.room_list_quick_actions_low_priority_add,
-            R.drawable.ic_low_priority_24)
+            R.drawable.ic_low_priority_24
+    )
 
     data class Favorite(val roomId: String) : RoomListQuickActionsSharedAction(
             R.string.room_list_quick_actions_favorite_add,
-            R.drawable.ic_star_24dp)
+            R.drawable.ic_star_24dp
+    )
 
     data class Leave(val roomId: String, val showIcon: Boolean = true) : RoomListQuickActionsSharedAction(
             R.string.room_list_quick_actions_leave,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/threads/ThreadsActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/threads/ThreadsActivity.kt
index 726138ed93..13a12106c7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/threads/ThreadsActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/ThreadsActivity.kt
@@ -76,7 +76,8 @@ class ThreadsActivity : VectorBaseActivity<ActivityThreadsBinding>() {
         replaceFragment(
                 views.threadsActivityFragmentContainer,
                 ThreadListFragment::class.java,
-                threadListArgs)
+                threadListArgs
+        )
     }
 
     private fun initThreadTimelineFragment(threadTimelineArgs: ThreadTimelineArgs) =
@@ -87,7 +88,8 @@ class ThreadsActivity : VectorBaseActivity<ActivityThreadsBinding>() {
                             roomId = threadTimelineArgs.roomId,
                             eventId = getEventIdToNavigate(),
                             threadTimelineArgs = threadTimelineArgs
-                    ))
+                    )
+            )
 
     /**
      * This function is used to navigate to the selected thread timeline.
@@ -100,7 +102,8 @@ class ThreadsActivity : VectorBaseActivity<ActivityThreadsBinding>() {
                     R.anim.animation_slide_in_right,
                     R.anim.animation_slide_out_left,
                     R.anim.animation_slide_in_left,
-                    R.anim.animation_slide_out_right)
+                    R.anim.animation_slide_out_right
+            )
         }
         addFragmentToBackstack(
                 container = views.threadsActivityFragmentContainer,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/threads/ThreadsManager.kt b/vector/src/main/java/im/vector/app/features/home/room/threads/ThreadsManager.kt
index 29f7df2439..545077b550 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/threads/ThreadsManager.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/ThreadsManager.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.home.room.threads
 
 import android.app.Activity
 import android.text.Spanned
+import androidx.annotation.StringRes
 import androidx.core.text.HtmlCompat
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
@@ -49,11 +50,17 @@ class ThreadsManager @Inject constructor(
     /**
      * Generates and return an Html spanned string to be rendered especially in dialogs
      */
-    fun getBetaEnableThreadsMessage(): Spanned {
+    private fun generateLearnMoreHtmlString(@StringRes messageId: Int): Spanned {
         val learnMore = stringProvider.getString(R.string.action_learn_more)
         val learnMoreUrl = stringProvider.getString(R.string.threads_learn_more_url)
         val href = "<a href='$learnMoreUrl'>$learnMore</a>.<br><br>"
-        val message = stringProvider.getString(R.string.threads_beta_enable_notice_message, href)
+        val message = stringProvider.getString(messageId, href)
         return HtmlCompat.fromHtml(message, HtmlCompat.FROM_HTML_MODE_LEGACY)
     }
+
+    fun getBetaEnableThreadsMessage(): Spanned =
+            generateLearnMoreHtmlString(R.string.threads_beta_enable_notice_message)
+
+    fun getLabsEnableThreadsMessage(): Spanned =
+            generateLearnMoreHtmlString(R.string.threads_labs_enable_notice_message)
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListController.kt b/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListController.kt
index aeef69c6dc..6b3f0dc6b8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListController.kt
@@ -49,7 +49,7 @@ class ThreadListController @Inject constructor(
     }
 
     override fun buildModels() =
-            when (session.getHomeServerCapabilities().canUseThreading) {
+            when (session.homeServerCapabilitiesService().getHomeServerCapabilities().canUseThreading) {
                 true  -> buildThreadSummaries()
                 false -> buildThreadList()
             }
@@ -71,13 +71,13 @@ class ThreadListController @Inject constructor(
                 }
                 ?.forEach { threadSummary ->
                     val date = dateFormatter.format(threadSummary.latestEvent?.originServerTs, DateFormatKind.ROOM_LIST)
-                    val lastMessageFormatted =  threadSummary.let {
+                    val lastMessageFormatted = threadSummary.let {
                         displayableEventFormatter.formatThreadSummary(
                                 event = it.latestEvent,
                                 latestEdition = it.threadEditions.latestThreadEdition
                         ).toString()
                     }
-                    val rootMessageFormatted =  threadSummary.let {
+                    val rootMessageFormatted = threadSummary.let {
                         displayableEventFormatter.formatThreadSummary(
                                 event = it.rootEvent,
                                 latestEdition = it.threadEditions.rootThreadEdition
@@ -123,12 +123,12 @@ class ThreadListController @Inject constructor(
                 ?.forEach { timelineEvent ->
                     val date = dateFormatter.format(timelineEvent.root.threadDetails?.lastMessageTimestamp, DateFormatKind.ROOM_LIST)
                     val lastRootThreadEdition = timelineEvent.root.threadDetails?.lastRootThreadEdition
-                    val lastMessageFormatted =  timelineEvent.root.threadDetails?.threadSummaryLatestEvent.let {
+                    val lastMessageFormatted = timelineEvent.root.threadDetails?.threadSummaryLatestEvent.let {
                         displayableEventFormatter.formatThreadSummary(
                                 event = it,
                         ).toString()
                     }
-                    val rootMessageFormatted =  timelineEvent.root.let {
+                    val rootMessageFormatted = timelineEvent.root.let {
                         displayableEventFormatter.formatThreadSummary(
                                 event = it,
                                 latestEdition = lastRootThreadEdition
diff --git a/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListViewModel.kt
index 8840131f38..2722ca5090 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/list/viewmodel/ThreadListViewModel.kt
@@ -33,6 +33,7 @@ import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.threads.ThreadTimelineEvent
 import org.matrix.android.sdk.flow.flow
 
@@ -68,7 +69,7 @@ class ThreadListViewModel @AssistedInject constructor(@Assisted val initialState
      * capabilities
      */
     private fun fetchAndObserveThreads() {
-        when (session.getHomeServerCapabilities().canUseThreading) {
+        when (session.homeServerCapabilitiesService().getHomeServerCapabilities().canUseThreading) {
             true  -> {
                 fetchThreadList()
                 observeThreadSummaries()
@@ -84,7 +85,7 @@ class ThreadListViewModel @AssistedInject constructor(@Assisted val initialState
     private fun observeThreadSummaries() {
         room?.flow()
                 ?.liveThreadSummaries()
-                ?.map { room.enhanceThreadWithEditions(it) }
+                ?.map { room.threadsService().enhanceThreadWithEditions(it) }
                 ?.flowOn(room.coroutineDispatchers.io)
                 ?.execute { asyncThreads ->
                     copy(threadSummaryList = asyncThreads)
@@ -98,10 +99,10 @@ class ThreadListViewModel @AssistedInject constructor(@Assisted val initialState
     private fun observeThreadsList() {
         room?.flow()
                 ?.liveThreadList()
-                ?.map { room.mapEventsWithEdition(it) }
+                ?.map { room.threadsLocalService().mapEventsWithEdition(it) }
                 ?.map {
                     it.map { threadRootEvent ->
-                        val isParticipating = room.isUserParticipatingInThread(threadRootEvent.eventId)
+                        val isParticipating = room.threadsLocalService().isUserParticipatingInThread(threadRootEvent.eventId)
                         ThreadTimelineEvent(threadRootEvent, isParticipating)
                     }
                 }
@@ -114,7 +115,7 @@ class ThreadListViewModel @AssistedInject constructor(@Assisted val initialState
     private fun fetchThreadList() {
         viewModelScope.launch {
             setLoading(true)
-            room?.fetchThreadSummaries()
+            room?.threadsService()?.fetchThreadSummaries()
             setLoading(false)
         }
     }
@@ -125,7 +126,7 @@ class ThreadListViewModel @AssistedInject constructor(@Assisted val initialState
         }
     }
 
-    fun canHomeserverUseThreading() = session.getHomeServerCapabilities().canUseThreading
+    fun canHomeserverUseThreading() = session.homeServerCapabilitiesService().getHomeServerCapabilities().canUseThreading
 
     fun applyFiltering(shouldFilterThreads: Boolean) {
         analyticsTracker.capture(Interaction.Name.MobileThreadListFilterItem.toAnalyticsInteraction())
diff --git a/vector/src/main/java/im/vector/app/features/home/room/threads/list/views/ThreadListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/threads/list/views/ThreadListFragment.kt
index 16555ef03c..04889f375f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/threads/list/views/ThreadListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/threads/list/views/ThreadListFragment.kt
@@ -112,7 +112,8 @@ class ThreadListFragment @Inject constructor(
     private fun initTextConstants() {
         views.threadListEmptyNoticeTextView.text = String.format(
                 resources.getString(R.string.thread_list_empty_notice),
-                resources.getString(R.string.reply_in_thread))
+                resources.getString(R.string.reply_in_thread)
+        )
     }
 
     private fun initBetaFeedback() {
@@ -122,6 +123,7 @@ class ThreadListFragment @Inject constructor(
             bugReporter.openBugReportScreen(requireActivity(), reportType = ReportType.THREADS_BETA_FEEDBACK)
         }
     }
+
     override fun invalidate() = withState(threadListViewModel) { state ->
         invalidateOptionsMenu()
         renderEmptyStateIfNeeded(state)
@@ -148,7 +150,8 @@ class ThreadListFragment @Inject constructor(
                 displayName = threadSummary.rootThreadSenderInfo.displayName,
                 avatarUrl = threadSummary.rootThreadSenderInfo.avatarUrl,
                 roomEncryptionTrustLevel = null,
-                rootThreadEventId = threadSummary.rootEventId)
+                rootThreadEventId = threadSummary.rootEventId
+        )
         (activity as? ThreadsActivity)?.navigateToThreadTimeline(roomThreadDetailArgs)
     }
 
@@ -158,7 +161,8 @@ class ThreadListFragment @Inject constructor(
                 displayName = timelineEvent.senderInfo.displayName,
                 avatarUrl = timelineEvent.senderInfo.avatarUrl,
                 roomEncryptionTrustLevel = null,
-                rootThreadEventId = timelineEvent.eventId)
+                rootThreadEventId = timelineEvent.eventId
+        )
         (activity as? ThreadsActivity)?.navigateToThreadTimeline(threadTimelineArgs)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/typing/TypingHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/typing/TypingHelper.kt
index ca948e6fdb..6cc72a4045 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/typing/TypingHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/typing/TypingHelper.kt
@@ -33,13 +33,17 @@ class TypingHelper @Inject constructor(private val stringProvider: StringProvide
             typingUsers.size == 1 ->
                 stringProvider.getString(R.string.room_one_user_is_typing, typingUsers[0].disambiguatedDisplayName)
             typingUsers.size == 2 ->
-                stringProvider.getString(R.string.room_two_users_are_typing,
+                stringProvider.getString(
+                        R.string.room_two_users_are_typing,
                         typingUsers[0].disambiguatedDisplayName,
-                        typingUsers[1].disambiguatedDisplayName)
+                        typingUsers[1].disambiguatedDisplayName
+                )
             else                  ->
-                stringProvider.getString(R.string.room_many_users_are_typing,
+                stringProvider.getString(
+                        R.string.room_many_users_are_typing,
                         typingUsers[0].disambiguatedDisplayName,
-                        typingUsers[1].disambiguatedDisplayName)
+                        typingUsers[1].disambiguatedDisplayName
+                )
         }
     }
 
@@ -47,10 +51,14 @@ class TypingHelper @Inject constructor(private val stringProvider: StringProvide
         return when {
             typingUsers.isEmpty() -> ""
             typingUsers.size == 1 -> typingUsers[0].disambiguatedDisplayName
-            typingUsers.size == 2 -> stringProvider.getString(R.string.room_notification_two_users_are_typing,
-                    typingUsers[0].disambiguatedDisplayName, typingUsers[1].disambiguatedDisplayName)
-            else                  -> stringProvider.getString(R.string.room_notification_more_than_two_users_are_typing,
-                    typingUsers[0].disambiguatedDisplayName, typingUsers[1].disambiguatedDisplayName)
+            typingUsers.size == 2 -> stringProvider.getString(
+                    R.string.room_notification_two_users_are_typing,
+                    typingUsers[0].disambiguatedDisplayName, typingUsers[1].disambiguatedDisplayName
+            )
+            else                  -> stringProvider.getString(
+                    R.string.room_notification_more_than_two_users_are_typing,
+                    typingUsers[0].disambiguatedDisplayName, typingUsers[1].disambiguatedDisplayName
+            )
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/homeserver/HomeServerCapabilitiesViewModel.kt b/vector/src/main/java/im/vector/app/features/homeserver/HomeServerCapabilitiesViewModel.kt
index 9223485eff..1e4fccefd5 100644
--- a/vector/src/main/java/im/vector/app/features/homeserver/HomeServerCapabilitiesViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/homeserver/HomeServerCapabilitiesViewModel.kt
@@ -53,7 +53,7 @@ class HomeServerCapabilitiesViewModel @AssistedInject constructor(
         override fun initialState(viewModelContext: ViewModelContext): HomeServerCapabilitiesViewState {
             val session = EntryPoints.get(viewModelContext.app(), SingletonEntryPoint::class.java).activeSessionHolder().getSafeActiveSession()
             return HomeServerCapabilitiesViewState(
-                    capabilities = session?.getHomeServerCapabilities() ?: HomeServerCapabilities()
+                    capabilities = session?.homeServerCapabilitiesService()?.getHomeServerCapabilities() ?: HomeServerCapabilities()
             )
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/homeserver/ServerUrlsRepository.kt b/vector/src/main/java/im/vector/app/features/homeserver/ServerUrlsRepository.kt
index 5f1c709082..e815b7b0f3 100644
--- a/vector/src/main/java/im/vector/app/features/homeserver/ServerUrlsRepository.kt
+++ b/vector/src/main/java/im/vector/app/features/homeserver/ServerUrlsRepository.kt
@@ -67,9 +67,13 @@ object ServerUrlsRepository {
     fun getLastHomeServerUrl(context: Context): String {
         val prefs = DefaultSharedPreferences.getInstance(context)
 
-        return prefs.getString(HOME_SERVER_URL_PREF,
-                prefs.getString(DEFAULT_REFERRER_HOME_SERVER_URL_PREF,
-                        getDefaultHomeServerUrl(context))!!)!!
+        return prefs.getString(
+                HOME_SERVER_URL_PREF,
+                prefs.getString(
+                        DEFAULT_REFERRER_HOME_SERVER_URL_PREF,
+                        getDefaultHomeServerUrl(context)
+                )!!
+        )!!
     }
 
     /**
diff --git a/vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt b/vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt
index 506f5e773c..2d63d69c35 100644
--- a/vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt
+++ b/vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt
@@ -26,6 +26,8 @@ import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.glide.GlideApp
 import im.vector.app.features.home.AvatarRenderer
 import io.noties.markwon.core.spans.LinkSpan
+import org.matrix.android.sdk.api.session.getRoomSummary
+import org.matrix.android.sdk.api.session.getUser
 import org.matrix.android.sdk.api.session.permalinks.PermalinkData
 import org.matrix.android.sdk.api.session.permalinks.PermalinkParser
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
@@ -100,7 +102,7 @@ class PillsPostProcessor @AssistedInject constructor(@Assisted private val roomI
             if (roomId == null) {
                 sessionHolder.getSafeActiveSession()?.getUser(userId)?.toMatrixItem()
             } else {
-                sessionHolder.getSafeActiveSession()?.getRoomMember(userId, roomId)?.toMatrixItem()
+                sessionHolder.getSafeActiveSession()?.roomService()?.getRoomMember(userId, roomId)?.toMatrixItem()
             }
 
     private fun PermalinkData.RoomLink.toMatrixItem(): MatrixItem? =
@@ -116,7 +118,7 @@ class PillsPostProcessor @AssistedInject constructor(@Assisted private val roomI
             }
 
     private fun PermalinkData.GroupLink.toMatrixItem(): MatrixItem? {
-        val group = sessionHolder.getSafeActiveSession()?.getGroupSummary(groupId)
+        val group = sessionHolder.getSafeActiveSession()?.groupService()?.getGroupSummary(groupId)
         return MatrixItem.GroupItem(groupId, group?.displayName, group?.avatarUrl)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt
index 42f08c334e..cad46e06a1 100644
--- a/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt
@@ -31,6 +31,7 @@ import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoom
 
 class InviteUsersToRoomViewModel @AssistedInject constructor(
         @Assisted initialState: InviteUsersToRoomViewState,
@@ -59,8 +60,8 @@ class InviteUsersToRoomViewModel @AssistedInject constructor(
             selections.asFlow()
                     .map { user ->
                         when (user) {
-                            is PendingSelection.UserPendingSelection     -> room.invite(user.user.userId, null)
-                            is PendingSelection.ThreePidPendingSelection -> room.invite3pid(user.threePid)
+                            is PendingSelection.UserPendingSelection     -> room.membershipService().invite(user.user.userId, null)
+                            is PendingSelection.ThreePidPendingSelection -> room.membershipService().invite3pid(user.threePid)
                         }
                     }
                     .catch { cause ->
@@ -68,15 +69,21 @@ class InviteUsersToRoomViewModel @AssistedInject constructor(
                     }
                     .collect {
                         val successMessage = when (selections.size) {
-                            1    -> stringProvider.getString(R.string.invitation_sent_to_one_user,
-                                    selections.first().getBestName())
-                            2    -> stringProvider.getString(R.string.invitations_sent_to_two_users,
+                            1    -> stringProvider.getString(
+                                    R.string.invitation_sent_to_one_user,
+                                    selections.first().getBestName()
+                            )
+                            2    -> stringProvider.getString(
+                                    R.string.invitations_sent_to_two_users,
                                     selections.first().getBestName(),
-                                    selections.last().getBestName())
-                            else -> stringProvider.getQuantityString(R.plurals.invitations_sent_to_one_and_more_users,
+                                    selections.last().getBestName()
+                            )
+                            else -> stringProvider.getQuantityString(
+                                    R.plurals.invitations_sent_to_one_and_more_users,
                                     selections.size - 1,
                                     selections.first().getBestName(),
-                                    selections.size - 1)
+                                    selections.size - 1
+                            )
                         }
                         _viewEvents.post(InviteUsersToRoomViewEvents.Success(successMessage))
                     }
diff --git a/vector/src/main/java/im/vector/app/features/invite/InvitesAcceptor.kt b/vector/src/main/java/im/vector/app/features/invite/InvitesAcceptor.kt
index a482998f77..bdc9ee2d1a 100644
--- a/vector/src/main/java/im/vector/app/features/invite/InvitesAcceptor.kt
+++ b/vector/src/main/java/im/vector/app/features/invite/InvitesAcceptor.kt
@@ -34,6 +34,7 @@ import kotlinx.coroutines.sync.withPermit
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
@@ -111,11 +112,11 @@ class InvitesAcceptor @Inject constructor(
             rejectInviteSafely(roomId)
             return
         }
-        val roomMembershipChanged = getChangeMemberships(roomId)
+        val roomMembershipChanged = roomService().getChangeMemberships(roomId)
         if (roomMembershipChanged != ChangeMembershipState.Joined && !roomMembershipChanged.isInProgress()) {
             try {
                 Timber.v("Try auto join room: $roomId")
-                joinRoom(roomId)
+                roomService().joinRoom(roomId)
             } catch (failure: Throwable) {
                 Timber.v("Failed auto join room: $roomId")
                 // if we got 404 on invites, the inviting user have left or the hs is off.
@@ -134,7 +135,7 @@ class InvitesAcceptor @Inject constructor(
 
     private suspend fun Session.rejectInviteSafely(roomId: String) {
         try {
-            leaveRoom(roomId)
+            roomService().leaveRoom(roomId)
             shouldRejectRoomIds.remove(roomId)
         } catch (failure: Throwable) {
             Timber.v("Fail rejecting invite for room: $roomId")
diff --git a/vector/src/main/java/im/vector/app/features/invite/VectorInviteView.kt b/vector/src/main/java/im/vector/app/features/invite/VectorInviteView.kt
index d9f1ad343b..7c5159ce11 100644
--- a/vector/src/main/java/im/vector/app/features/invite/VectorInviteView.kt
+++ b/vector/src/main/java/im/vector/app/features/invite/VectorInviteView.kt
@@ -32,7 +32,7 @@ import javax.inject.Inject
 
 @AndroidEntryPoint
 class VectorInviteView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0) :
-    ConstraintLayout(context, attrs, defStyle) {
+        ConstraintLayout(context, attrs, defStyle) {
 
     interface Callback {
         fun onAcceptInvite()
diff --git a/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt b/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
index 2cb41784b7..5b44f69821 100644
--- a/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt
@@ -133,7 +133,7 @@ class LinkHandlerActivity : VectorBaseActivity<ActivityProgressBinding>() {
         } else {
             lifecycleScope.launch {
                 try {
-                    session.signOut(true)
+                    session.signOutService().signOut(true)
                     Timber.d("## displayAlreadyLoginPopup(): logout succeeded")
                     sessionHolder.clearActiveSession()
                     startLoginActivity(uri)
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingService.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingService.kt
index 2126cdac04..362b82ccf5 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingService.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingService.kt
@@ -31,8 +31,8 @@ import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent
-import org.matrix.android.sdk.api.session.room.model.livelocation.BeaconInfo
-import org.matrix.android.sdk.api.session.room.model.livelocation.LiveLocationBeaconContent
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconInfoContent
 import timber.log.Timber
 import java.util.Timer
 import java.util.TimerTask
@@ -96,17 +96,16 @@ class LocationSharingService : VectorService(), LocationTracker.Callback {
     }
 
     private suspend fun sendLiveBeaconInfo(session: Session, roomArgs: RoomArgs) {
-        val beaconContent = LiveLocationBeaconContent(
-                unstableBeaconInfo = BeaconInfo(
-                        timeout = roomArgs.durationMillis,
-                        isLive = true
-                ),
-                unstableTimestampAsMilliseconds = clock.epochMillis()
+        val beaconContent = MessageBeaconInfoContent(
+                timeout = roomArgs.durationMillis,
+                isLive = true,
+                unstableTimestampMillis = clock.epochMillis()
         ).toContent()
 
         val stateKey = session.myUserId
         session
                 .getRoom(roomArgs.roomId)
+                ?.stateService()
                 ?.sendStateEvent(
                         eventType = EventType.STATE_ROOM_BEACON_INFO.first(),
                         stateKey = stateKey,
@@ -149,7 +148,7 @@ class LocationSharingService : VectorService(), LocationTracker.Callback {
                 .getSafeActiveSession()
                 ?.let { session ->
                     session.coroutineScope.launch(session.coroutineDispatchers.io) {
-                        session.getRoom(roomId)?.stopLiveLocation(session.myUserId)
+                        session.getRoom(roomId)?.stateService()?.stopLiveLocation(session.myUserId)
                     }
                 }
     }
@@ -176,10 +175,11 @@ class LocationSharingService : VectorService(), LocationTracker.Callback {
         }
 
         room
+                .stateService()
                 .getLiveLocationBeaconInfo(userId, true)
                 ?.eventId
                 ?.let {
-                    room.sendLiveLocation(
+                    room.sendService().sendLiveLocation(
                             beaconInfoEventId = it,
                             latitude = locationData.latitude,
                             longitude = locationData.longitude,
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
index e67d5d0abb..231de00094 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
@@ -36,6 +36,8 @@ import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.getUser
 import org.matrix.android.sdk.api.util.toMatrixItem
 
 /**
@@ -134,7 +136,7 @@ class LocationSharingViewModel @AssistedInject constructor(
 
     private fun shareLocation(locationData: LocationData?, isUserLocation: Boolean) {
         locationData?.let { location ->
-            room.sendLocation(
+            room.sendService().sendLocation(
                     latitude = location.latitude,
                     longitude = location.longitude,
                     uncertainty = location.uncertainty,
@@ -159,11 +161,13 @@ class LocationSharingViewModel @AssistedInject constructor(
     }
 
     private fun handleStartLiveLocationSharingAction(durationMillis: Long) {
-        _viewEvents.post(LocationSharingViewEvents.StartLiveLocationService(
-                sessionId = session.sessionId,
-                roomId = room.roomId,
-                durationMillis = durationMillis
-        ))
+        _viewEvents.post(
+                LocationSharingViewEvents.StartLiveLocationService(
+                        sessionId = session.sessionId,
+                        roomId = room.roomId,
+                        durationMillis = durationMillis
+                )
+        )
     }
 
     override fun onLocationUpdate(locationData: LocationData) {
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt b/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
index dec6fef040..d4730ecc8b 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
@@ -42,10 +42,10 @@ import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.home.HomeActivity
 import im.vector.app.features.login.terms.LoginTermsFragment
 import im.vector.app.features.login.terms.LoginTermsFragmentArgument
-import im.vector.app.features.login.terms.toLocalizedLoginTerms
 import im.vector.app.features.pin.UnlockedActivity
 import org.matrix.android.sdk.api.auth.registration.FlowResult
 import org.matrix.android.sdk.api.auth.registration.Stage
+import org.matrix.android.sdk.api.auth.toLocalizedLoginTerms
 import org.matrix.android.sdk.api.extensions.tryOrNull
 
 /**
@@ -119,7 +119,8 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
                         // First ask for login and password
                         // I add a tag to indicate that this fragment is a registration stage.
                         // This way it will be automatically popped in when starting the next registration stage
-                        addFragmentToBackstack(views.loginFragmentContainer,
+                        addFragmentToBackstack(
+                                views.loginFragmentContainer,
                                 LoginFragment::class.java,
                                 tag = FRAGMENT_REGISTRATION_STAGE_TAG,
                                 option = commonOption
@@ -150,25 +151,33 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
             is LoginViewEvents.OnServerSelectionDone                      -> onServerSelectionDone(loginViewEvents)
             is LoginViewEvents.OnSignModeSelected                         -> onSignModeSelected(loginViewEvents)
             is LoginViewEvents.OnLoginFlowRetrieved                       ->
-                addFragmentToBackstack(views.loginFragmentContainer,
+                addFragmentToBackstack(
+                        views.loginFragmentContainer,
                         LoginSignUpSignInSelectionFragment::class.java,
-                        option = commonOption)
+                        option = commonOption
+                )
             is LoginViewEvents.OnWebLoginError                            -> onWebLoginError(loginViewEvents)
             is LoginViewEvents.OnForgetPasswordClicked                    ->
-                addFragmentToBackstack(views.loginFragmentContainer,
+                addFragmentToBackstack(
+                        views.loginFragmentContainer,
                         LoginResetPasswordFragment::class.java,
-                        option = commonOption)
+                        option = commonOption
+                )
             is LoginViewEvents.OnResetPasswordSendThreePidDone            -> {
                 supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
-                addFragmentToBackstack(views.loginFragmentContainer,
+                addFragmentToBackstack(
+                        views.loginFragmentContainer,
                         LoginResetPasswordMailConfirmationFragment::class.java,
-                        option = commonOption)
+                        option = commonOption
+                )
             }
             is LoginViewEvents.OnResetPasswordMailConfirmationSuccess     -> {
                 supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
-                addFragmentToBackstack(views.loginFragmentContainer,
+                addFragmentToBackstack(
+                        views.loginFragmentContainer,
                         LoginResetPasswordSuccessFragment::class.java,
-                        option = commonOption)
+                        option = commonOption
+                )
             }
             is LoginViewEvents.OnResetPasswordMailConfirmationSuccessDone -> {
                 // Go back to the login fragment
@@ -177,20 +186,24 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
             is LoginViewEvents.OnSendEmailSuccess                         -> {
                 // Pop the enter email Fragment
                 supportFragmentManager.popBackStack(FRAGMENT_REGISTRATION_STAGE_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
-                addFragmentToBackstack(views.loginFragmentContainer,
+                addFragmentToBackstack(
+                        views.loginFragmentContainer,
                         LoginWaitForEmailFragment::class.java,
                         LoginWaitForEmailFragmentArgument(loginViewEvents.email),
                         tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                        option = commonOption)
+                        option = commonOption
+                )
             }
             is LoginViewEvents.OnSendMsisdnSuccess                        -> {
                 // Pop the enter Msisdn Fragment
                 supportFragmentManager.popBackStack(FRAGMENT_REGISTRATION_STAGE_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
-                addFragmentToBackstack(views.loginFragmentContainer,
+                addFragmentToBackstack(
+                        views.loginFragmentContainer,
                         LoginGenericTextInputFormFragment::class.java,
                         LoginGenericTextInputFormFragmentArgument(TextInputFormFragmentMode.ConfirmMsisdn, true, loginViewEvents.msisdn),
                         tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                        option = commonOption)
+                        option = commonOption
+                )
             }
             is LoginViewEvents.Failure,
             is LoginViewEvents.Loading                                    ->
@@ -234,9 +247,11 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
         when (loginViewEvents.serverType) {
             ServerType.MatrixOrg -> Unit // In this case, we wait for the login flow
             ServerType.EMS,
-            ServerType.Other     -> addFragmentToBackstack(views.loginFragmentContainer,
+            ServerType.Other     -> addFragmentToBackstack(
+                    views.loginFragmentContainer,
                     LoginServerUrlFormFragment::class.java,
-                    option = commonOption)
+                    option = commonOption
+            )
             ServerType.Unknown   -> Unit /* Should not happen */
         }
     }
@@ -254,17 +269,21 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
                     LoginMode.Unknown,
                     is LoginMode.Sso      -> error("Developer error")
                     is LoginMode.SsoAndPassword,
-                    LoginMode.Password    -> addFragmentToBackstack(views.loginFragmentContainer,
+                    LoginMode.Password    -> addFragmentToBackstack(
+                            views.loginFragmentContainer,
                             LoginFragment::class.java,
                             tag = FRAGMENT_LOGIN_TAG,
-                            option = commonOption)
+                            option = commonOption
+                    )
                     LoginMode.Unsupported -> onLoginModeNotSupported(state.loginModeSupportedTypes)
                 }
             }
-            SignMode.SignInWithMatrixId -> addFragmentToBackstack(views.loginFragmentContainer,
+            SignMode.SignInWithMatrixId -> addFragmentToBackstack(
+                    views.loginFragmentContainer,
                     LoginFragment::class.java,
                     tag = FRAGMENT_LOGIN_TAG,
-                    option = commonOption)
+                    option = commonOption
+            )
         }
     }
 
@@ -288,9 +307,11 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
                 .setTitle(R.string.app_name)
                 .setMessage(getString(R.string.login_registration_not_supported))
                 .setPositiveButton(R.string.yes) { _, _ ->
-                    addFragmentToBackstack(views.loginFragmentContainer,
+                    addFragmentToBackstack(
+                            views.loginFragmentContainer,
                             LoginWebFragment::class.java,
-                            option = commonOption)
+                            option = commonOption
+                    )
                 }
                 .setNegativeButton(R.string.no, null)
                 .show()
@@ -301,9 +322,11 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
                 .setTitle(R.string.app_name)
                 .setMessage(getString(R.string.login_mode_not_supported, supportedTypes.joinToString { "'$it'" }))
                 .setPositiveButton(R.string.yes) { _, _ ->
-                    addFragmentToBackstack(views.loginFragmentContainer,
+                    addFragmentToBackstack(
+                            views.loginFragmentContainer,
                             LoginWebFragment::class.java,
-                            option = commonOption)
+                            option = commonOption
+                    )
                 }
                 .setNegativeButton(R.string.no, null)
                 .show()
@@ -331,26 +354,34 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), UnlockedA
         supportFragmentManager.popBackStack(FRAGMENT_REGISTRATION_STAGE_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
 
         when (stage) {
-            is Stage.ReCaptcha -> addFragmentToBackstack(views.loginFragmentContainer,
+            is Stage.ReCaptcha -> addFragmentToBackstack(
+                    views.loginFragmentContainer,
                     LoginCaptchaFragment::class.java,
                     LoginCaptchaFragmentArgument(stage.publicKey),
                     tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                    option = commonOption)
-            is Stage.Email     -> addFragmentToBackstack(views.loginFragmentContainer,
+                    option = commonOption
+            )
+            is Stage.Email     -> addFragmentToBackstack(
+                    views.loginFragmentContainer,
                     LoginGenericTextInputFormFragment::class.java,
                     LoginGenericTextInputFormFragmentArgument(TextInputFormFragmentMode.SetEmail, stage.mandatory),
                     tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                    option = commonOption)
-            is Stage.Msisdn    -> addFragmentToBackstack(views.loginFragmentContainer,
+                    option = commonOption
+            )
+            is Stage.Msisdn    -> addFragmentToBackstack(
+                    views.loginFragmentContainer,
                     LoginGenericTextInputFormFragment::class.java,
                     LoginGenericTextInputFormFragmentArgument(TextInputFormFragmentMode.SetMsisdn, stage.mandatory),
                     tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                    option = commonOption)
-            is Stage.Terms     -> addFragmentToBackstack(views.loginFragmentContainer,
+                    option = commonOption
+            )
+            is Stage.Terms     -> addFragmentToBackstack(
+                    views.loginFragmentContainer,
                     LoginTermsFragment::class.java,
                     LoginTermsFragmentArgument(stage.policies.toLocalizedLoginTerms(getString(R.string.resources_language))),
                     tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                    option = commonOption)
+                    option = commonOption
+            )
             else               -> Unit // Should not happen
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
index 49198087d9..14587b7c09 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
@@ -117,11 +117,13 @@ class LoginFragment @Inject constructor() : AbstractSSOLoginFragment<FragmentLog
         // This can be called by the IME action, so deal with empty cases
         var error = 0
         if (login.isEmpty()) {
-            views.loginFieldTil.error = getString(if (isSignupMode) {
-                R.string.error_empty_field_choose_user_name
-            } else {
-                R.string.error_empty_field_enter_user_name
-            })
+            views.loginFieldTil.error = getString(
+                    if (isSignupMode) {
+                        R.string.error_empty_field_choose_user_name
+                    } else {
+                        R.string.error_empty_field_enter_user_name
+                    }
+            )
             error++
         }
         if (isSignupMode && isNumericOnlyUserIdForbidden && login.isDigitsOnly()) {
@@ -129,11 +131,13 @@ class LoginFragment @Inject constructor() : AbstractSSOLoginFragment<FragmentLog
             error++
         }
         if (password.isEmpty()) {
-            views.passwordFieldTil.error = getString(if (isSignupMode) {
-                R.string.error_empty_field_choose_password
-            } else {
-                R.string.error_empty_field_your_password
-            })
+            views.passwordFieldTil.error = getString(
+                    if (isSignupMode) {
+                        R.string.error_empty_field_choose_password
+                    } else {
+                        R.string.error_empty_field_your_password
+                    }
+            )
             error++
         }
 
@@ -149,12 +153,14 @@ class LoginFragment @Inject constructor() : AbstractSSOLoginFragment<FragmentLog
     }
 
     private fun setupUi(state: LoginViewState) {
-        views.loginFieldTil.hint = getString(when (state.signMode) {
-            SignMode.Unknown            -> error("developer error")
-            SignMode.SignUp             -> R.string.login_signup_username_hint
-            SignMode.SignIn             -> R.string.login_signin_username_hint
-            SignMode.SignInWithMatrixId -> R.string.login_signin_matrix_id_hint
-        })
+        views.loginFieldTil.hint = getString(
+                when (state.signMode) {
+                    SignMode.Unknown            -> error("developer error")
+                    SignMode.SignUp             -> R.string.login_signup_username_hint
+                    SignMode.SignIn             -> R.string.login_signin_username_hint
+                    SignMode.SignInWithMatrixId -> R.string.login_signin_matrix_id_hint
+                }
+        )
 
         // Handle direct signin first
         if (state.signMode == SignMode.SignInWithMatrixId) {
@@ -215,12 +221,14 @@ class LoginFragment @Inject constructor() : AbstractSSOLoginFragment<FragmentLog
     private fun setupButtons(state: LoginViewState) {
         views.forgetPasswordButton.isVisible = state.signMode == SignMode.SignIn
 
-        views.loginSubmit.text = getString(when (state.signMode) {
-            SignMode.Unknown            -> error("developer error")
-            SignMode.SignUp             -> R.string.login_signup_submit
-            SignMode.SignIn,
-            SignMode.SignInWithMatrixId -> R.string.login_signin
-        })
+        views.loginSubmit.text = getString(
+                when (state.signMode) {
+                    SignMode.Unknown            -> error("developer error")
+                    SignMode.SignUp             -> R.string.login_signup_submit
+                    SignMode.SignIn,
+                    SignMode.SignInWithMatrixId -> R.string.login_signin
+                }
+        )
     }
 
     private fun setupSubmitButton() {
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginMode.kt b/vector/src/main/java/im/vector/app/features/login/LoginMode.kt
index 00945968fb..9713e492ec 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginMode.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginMode.kt
@@ -20,8 +20,8 @@ import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
 
-sealed class LoginMode : Parcelable
-/** because persist state */ {
+sealed class LoginMode : Parcelable { // Parcelable because persist state
+
     @Parcelize object Unknown : LoginMode()
     @Parcelize object Password : LoginMode()
     @Parcelize data class Sso(val ssoIdentityProviders: List<SsoIdentityProvider>?) : LoginMode()
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
index e2fcb2fd12..ca9582b44b 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
@@ -100,11 +100,13 @@ class LoginServerUrlFormFragment @Inject constructor() : AbstractLoginFragment<F
             }
         }
         val completions = state.knownCustomHomeServersUrls + if (BuildConfig.DEBUG) listOf("http://10.0.2.2:8080") else emptyList()
-        views.loginServerUrlFormHomeServerUrl.setAdapter(ArrayAdapter(
-                requireContext(),
-                R.layout.item_completion_homeserver,
-                completions
-        ))
+        views.loginServerUrlFormHomeServerUrl.setAdapter(
+                ArrayAdapter(
+                        requireContext(),
+                        R.layout.item_completion_homeserver,
+                        completions
+                )
+        )
         views.loginServerUrlFormHomeServerUrlTil.endIconMode = TextInputLayout.END_ICON_DROPDOWN_MENU
                 .takeIf { completions.isNotEmpty() }
                 ?: TextInputLayout.END_ICON_NONE
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
index 73f5c064e7..c9cb4612a8 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
@@ -617,7 +617,8 @@ class LoginViewModel @AssistedInject constructor(
                     alteredHomeServerConnectionConfig,
                     action.username,
                     action.password,
-                    action.initialDeviceName)
+                    action.initialDeviceName
+            )
         } catch (failure: Throwable) {
             onDirectLoginError(failure)
             return
diff --git a/vector/src/main/java/im/vector/app/features/login/SocialLoginButtonsView.kt b/vector/src/main/java/im/vector/app/features/login/SocialLoginButtonsView.kt
index 515c8e9d39..68fc2d1c59 100644
--- a/vector/src/main/java/im/vector/app/features/login/SocialLoginButtonsView.kt
+++ b/vector/src/main/java/im/vector/app/features/login/SocialLoginButtonsView.kt
@@ -28,7 +28,7 @@ import im.vector.app.R
 import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
 
 class SocialLoginButtonsView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0) :
-    LinearLayout(context, attrs, defStyle) {
+        LinearLayout(context, attrs, defStyle) {
 
     fun interface InteractionListener {
         fun onProviderSelected(id: String?)
@@ -99,10 +99,10 @@ class SocialLoginButtonsView @JvmOverloads constructor(context: Context, attrs:
                         SsoIdentityProvider.BRAND_TWITTER  -> {
                             MaterialButton(context, null, R.attr.vctr_social_login_button_twitter_style)
                         }
-                        SsoIdentityProvider.BRAND_GITLAB  -> {
+                        SsoIdentityProvider.BRAND_GITLAB   -> {
                             MaterialButton(context, null, R.attr.vctr_social_login_button_gitlab_style)
                         }
-                        else                            -> {
+                        else                               -> {
                             // TODO Use iconUrl
                             MaterialButton(context, null, R.attr.materialButtonOutlinedStyle).apply {
                                 transformationMethod = null
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginGenericTextInputFormFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginGenericTextInputFormFragment2.kt
index 76af86fda8..f623fb5abd 100644
--- a/vector/src/main/java/im/vector/app/features/login2/LoginGenericTextInputFormFragment2.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/LoginGenericTextInputFormFragment2.kt
@@ -75,8 +75,8 @@ class LoginGenericTextInputFormFragment2 @Inject constructor() : AbstractLoginFr
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             views.loginGenericTextInputFormTextInput.setAutofillHints(
                     when (params.mode) {
-                        TextInputFormFragmentMode.SetEmail  -> HintConstants.AUTOFILL_HINT_EMAIL_ADDRESS
-                        TextInputFormFragmentMode.SetMsisdn -> HintConstants.AUTOFILL_HINT_PHONE_NUMBER
+                        TextInputFormFragmentMode.SetEmail      -> HintConstants.AUTOFILL_HINT_EMAIL_ADDRESS
+                        TextInputFormFragmentMode.SetMsisdn     -> HintConstants.AUTOFILL_HINT_PHONE_NUMBER
                         TextInputFormFragmentMode.ConfirmMsisdn -> HintConstants.AUTOFILL_HINT_SMS_OTP
                     }
             )
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginServerUrlFormFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginServerUrlFormFragment2.kt
index 0732d176ac..b0201abc9a 100644
--- a/vector/src/main/java/im/vector/app/features/login2/LoginServerUrlFormFragment2.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/LoginServerUrlFormFragment2.kt
@@ -81,11 +81,13 @@ class LoginServerUrlFormFragment2 @Inject constructor() : AbstractLoginFragment2
 
     private fun setupUi(state: LoginViewState2) {
         val completions = state.knownCustomHomeServersUrls + if (BuildConfig.DEBUG) listOf("http://10.0.2.2:8080") else emptyList()
-        views.loginServerUrlFormHomeServerUrl.setAdapter(ArrayAdapter(
-                requireContext(),
-                R.layout.item_completion_homeserver,
-                completions
-        ))
+        views.loginServerUrlFormHomeServerUrl.setAdapter(
+                ArrayAdapter(
+                        requireContext(),
+                        R.layout.item_completion_homeserver,
+                        completions
+                )
+        )
         views.loginServerUrlFormHomeServerUrlTil.endIconMode = TextInputLayout.END_ICON_DROPDOWN_MENU
                 .takeIf { completions.isNotEmpty() }
                 ?: TextInputLayout.END_ICON_NONE
diff --git a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt b/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt
index 8223053ad8..87363854b1 100644
--- a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedFragment.kt
@@ -31,6 +31,7 @@ import im.vector.app.core.date.VectorDateFormatter
 import im.vector.app.core.dialogs.GalleryOrCameraDialogHelper
 import im.vector.app.core.intent.getFilenameFromUri
 import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.time.Clock
 import im.vector.app.databinding.DialogBaseEditTextBinding
 import im.vector.app.databinding.FragmentLoginAccountCreatedBinding
 import im.vector.app.features.displayname.getBestName
@@ -52,13 +53,14 @@ class AccountCreatedFragment @Inject constructor(
         private val avatarRenderer: AvatarRenderer,
         private val dateFormatter: VectorDateFormatter,
         private val matrixItemColorProvider: MatrixItemColorProvider,
+        private val clock: Clock,
         colorProvider: ColorProvider
 ) : AbstractLoginFragment2<FragmentLoginAccountCreatedBinding>(),
         GalleryOrCameraDialogHelper.Listener {
 
     private val viewModel: AccountCreatedViewModel by fragmentViewModel()
 
-    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider)
+    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider, clock)
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginAccountCreatedBinding {
         return FragmentLoginAccountCreatedBinding.inflate(inflater, container, false)
@@ -73,7 +75,7 @@ class AccountCreatedFragment @Inject constructor(
 
         viewModel.onEach { invalidateState(it) }
 
-        views.loginAccountCreatedTime.text = dateFormatter.format(System.currentTimeMillis(), DateFormatKind.MESSAGE_SIMPLE)
+        views.loginAccountCreatedTime.text = dateFormatter.format(clock.epochMillis(), DateFormatKind.MESSAGE_SIMPLE)
     }
 
     private fun observeViewEvents() {
@@ -113,9 +115,11 @@ class AccountCreatedFragment @Inject constructor(
 
     override fun onImageReady(uri: Uri?) {
         uri ?: return
-        viewModel.handle(AccountCreatedAction.SetAvatar(
-                avatarUri = uri,
-                filename = getFilenameFromUri(requireContext(), uri) ?: UUID.randomUUID().toString())
+        viewModel.handle(
+                AccountCreatedAction.SetAvatar(
+                        avatarUri = uri,
+                        filename = getFilenameFromUri(requireContext(), uri) ?: UUID.randomUUID().toString()
+                )
         )
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedViewModel.kt b/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedViewModel.kt
index 568cdab119..ac4edba7fb 100644
--- a/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/created/AccountCreatedViewModel.kt
@@ -81,7 +81,7 @@ class AccountCreatedViewModel @AssistedInject constructor(
     private fun handleSetAvatar(action: AccountCreatedAction.SetAvatar) {
         setState { copy(isLoading = true) }
         viewModelScope.launch {
-            val result = runCatching { session.updateAvatar(session.myUserId, action.avatarUri, action.filename) }
+            val result = runCatching { session.profileService().updateAvatar(session.myUserId, action.avatarUri, action.filename) }
                     .onFailure { _viewEvents.post(AccountCreatedViewEvents.Failure(it)) }
             setState {
                 copy(
@@ -95,7 +95,7 @@ class AccountCreatedViewModel @AssistedInject constructor(
     private fun handleSetDisplayName(action: AccountCreatedAction.SetDisplayName) {
         setState { copy(isLoading = true) }
         viewModelScope.launch {
-            val result = runCatching { session.setDisplayName(session.myUserId, action.displayName) }
+            val result = runCatching { session.profileService().setDisplayName(session.myUserId, action.displayName) }
                     .onFailure { _viewEvents.post(AccountCreatedViewEvents.Failure(it)) }
             setState {
                 copy(
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToAction.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToAction.kt
index f38049640d..25db811600 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToAction.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToAction.kt
@@ -24,7 +24,7 @@ sealed class MatrixToAction : VectorViewModelAction {
     object FailedToResolveUser : MatrixToAction()
     object FailedToStartChatting : MatrixToAction()
     data class JoinSpace(val spaceID: String, val viaServers: List<String>?) : MatrixToAction()
-    data class JoinRoom(val roomId: String, val viaServers: List<String>?) : MatrixToAction()
+    data class JoinRoom(val roomIdOrAlias: String, val viaServers: List<String>?) : MatrixToAction()
     data class OpenSpace(val spaceID: String) : MatrixToAction()
     data class OpenRoom(val roomId: String) : MatrixToAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
index 61dcd48779..8c685b8178 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
@@ -32,6 +32,7 @@ import im.vector.app.R
 import im.vector.app.core.extensions.commitTransaction
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.databinding.BottomSheetMatrixToCardBinding
+import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.home.AvatarRenderer
 import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.session.permalinks.PermalinkData
@@ -44,7 +45,8 @@ class MatrixToBottomSheet :
 
     @Parcelize
     data class MatrixToArgs(
-            val matrixToLink: String
+            val matrixToLink: String,
+            val origin: OriginOfMatrixTo
     ) : Parcelable
 
     @Inject lateinit var avatarRenderer: AvatarRenderer
@@ -58,7 +60,7 @@ class MatrixToBottomSheet :
     private val viewModel by fragmentViewModel(MatrixToBottomSheetViewModel::class)
 
     interface InteractionListener {
-        fun mxToBottomSheetNavigateToRoom(roomId: String)
+        fun mxToBottomSheetNavigateToRoom(roomId: String, trigger: ViewRoom.Trigger?)
         fun mxToBottomSheetSwitchToSpace(spaceId: String)
     }
 
@@ -82,7 +84,8 @@ class MatrixToBottomSheet :
     private fun showFragment(fragmentClass: KClass<out Fragment>, bundle: Bundle) {
         if (childFragmentManager.findFragmentByTag(fragmentClass.simpleName) == null) {
             childFragmentManager.commitTransaction {
-                replace(views.matrixToCardFragmentContainer.id,
+                replace(
+                        views.matrixToCardFragmentContainer.id,
                         fragmentClass.java,
                         bundle,
                         fragmentClass.simpleName
@@ -97,7 +100,9 @@ class MatrixToBottomSheet :
         viewModel.observeViewEvents {
             when (it) {
                 is MatrixToViewEvents.NavigateToRoom  -> {
-                    interactionListener?.mxToBottomSheetNavigateToRoom(it.roomId)
+                    withState(viewModel) { state ->
+                        interactionListener?.mxToBottomSheetNavigateToRoom(it.roomId, state.origin.toViewRoomTrigger())
+                    }
                     dismiss()
                 }
                 MatrixToViewEvents.Dismiss            -> dismiss()
@@ -116,9 +121,9 @@ class MatrixToBottomSheet :
     }
 
     companion object {
-        fun withLink(matrixToLink: String): MatrixToBottomSheet {
+        fun withLink(matrixToLink: String, origin: OriginOfMatrixTo): MatrixToBottomSheet {
             return MatrixToBottomSheet().apply {
-                setArguments(MatrixToArgs(matrixToLink = matrixToLink))
+                setArguments(MatrixToArgs(matrixToLink = matrixToLink, origin = origin))
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetState.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetState.kt
index 0fff2495f9..a6eb2a9afc 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetState.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetState.kt
@@ -30,12 +30,14 @@ data class MatrixToBottomSheetState(
         val matrixItem: Async<MatrixItem> = Uninitialized,
         val startChattingState: Async<Unit> = Uninitialized,
         val roomPeekResult: Async<RoomInfoResult> = Uninitialized,
-        val peopleYouKnow: Async<List<MatrixItem.UserItem>> = Uninitialized
+        val peopleYouKnow: Async<List<MatrixItem.UserItem>> = Uninitialized,
+        val origin: OriginOfMatrixTo
 ) : MavericksState {
 
     constructor(args: MatrixToBottomSheet.MatrixToArgs) : this(
             deepLink = args.matrixToLink,
-            linkType = PermalinkParser.parse(args.matrixToLink)
+            linkType = PermalinkParser.parse(args.matrixToLink),
+            origin = args.origin
     )
 }
 
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
index 04c2c8dd44..18070c8e6c 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
@@ -30,11 +30,16 @@ import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.analytics.AnalyticsTracker
+import im.vector.app.features.analytics.extensions.toAnalyticsJoinedRoom
 import im.vector.app.features.createdirect.DirectRoomHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.MatrixPatterns
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.permalinks.PermalinkData
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.peeking.PeekResult
@@ -48,7 +53,8 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
         private val session: Session,
         private val stringProvider: StringProvider,
         private val directRoomHelper: DirectRoomHelper,
-        private val errorFormatter: ErrorFormatter
+        private val errorFormatter: ErrorFormatter,
+        private val analyticsTracker: AnalyticsTracker
 ) : VectorViewModel<MatrixToBottomSheetState, MatrixToAction, MatrixToViewEvents>(initialState) {
 
     @AssistedFactory
@@ -109,7 +115,7 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
                 // could this room be already known
                 val knownRoom = if (permalinkData.isRoomAlias) {
                     tryOrNull {
-                        session.getRoomIdByAlias(permalinkData.roomIdOrAlias, false)
+                        session.roomService().getRoomIdByAlias(permalinkData.roomIdOrAlias, false)
                     }
                             ?.getOrNull()
                             ?.roomId?.let {
@@ -194,7 +200,7 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
     private fun checkForKnownMembers(someMembers: List<MatrixItem.UserItem>) {
         viewModelScope.launch(Dispatchers.Default) {
             val knownMembers = someMembers.filter {
-                session.getExistingDirectRoomWithUser(it.id) != null
+                session.roomService().getExistingDirectRoomWithUser(it.id) != null
             }
             // put one with avatar first, and take 5
             val finalRes = (knownMembers.filter { it.avatarUrl != null } + knownMembers.filter { it.avatarUrl == null })
@@ -233,7 +239,7 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
     }
 
     private suspend fun resolveUser(userId: String): User {
-        return tryOrNull { session.resolveUser(userId) }
+        return tryOrNull { session.userService().resolveUser(userId) }
         // Create raw user in case the user is not searchable
                 ?: User(userId, null, null)
     }
@@ -243,7 +249,7 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
      * main thing is trying to see if it's a space or a room
      */
     private suspend fun resolveRoom(roomIdOrAlias: String): PeekResult {
-        return session.peekRoom(roomIdOrAlias)
+        return session.roomService().peekRoom(roomIdOrAlias)
     }
 
     override fun handle(action: MatrixToAction) {
@@ -273,6 +279,11 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
         viewModelScope.launch {
             try {
                 val joinResult = session.spaceService().joinSpace(joinSpace.spaceID, null, joinSpace.viaServers?.take(3) ?: emptyList())
+                withState { state ->
+                    session.getRoomSummary(joinSpace.spaceID)?.let { summary ->
+                        analyticsTracker.capture(summary.toAnalyticsJoinedRoom(state.origin.toJoinedRoomTrigger()))
+                    }
+                }
                 if (joinResult.isSuccess()) {
                     _viewEvents.post(MatrixToViewEvents.NavigateToSpace(joinSpace.spaceID))
                 } else {
@@ -296,8 +307,19 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
         }
         viewModelScope.launch {
             try {
-                session.joinRoom(action.roomId, null, action.viaServers?.take(3) ?: emptyList())
-                _viewEvents.post(MatrixToViewEvents.NavigateToRoom(action.roomId))
+                session.roomService().joinRoom(
+                        roomIdOrAlias = action.roomIdOrAlias,
+                        reason = null,
+                        viaServers = action.viaServers?.take(3) ?: emptyList()
+                )
+
+                val roomId = getRoomIdFromRoomIdOrAlias(action.roomIdOrAlias)
+                withState { state ->
+                    session.getRoomSummary(roomId)?.let { summary ->
+                        analyticsTracker.capture(summary.toAnalyticsJoinedRoom(state.origin.toJoinedRoomTrigger()))
+                    }
+                }
+                _viewEvents.post(MatrixToViewEvents.NavigateToRoom(roomId))
             } catch (failure: Throwable) {
                 _viewEvents.post(MatrixToViewEvents.ShowModalError(errorFormatter.toHumanReadable(failure)))
             } finally {
@@ -309,6 +331,12 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
         }
     }
 
+    private suspend fun getRoomIdFromRoomIdOrAlias(roomIdOrAlias: String): String {
+        return if (MatrixPatterns.isRoomAlias(roomIdOrAlias)) {
+            session.roomService().getRoomIdByAlias(roomIdOrAlias, true).get().roomId
+        } else roomIdOrAlias
+    }
+
     private fun handleStartChatting(action: MatrixToAction.StartChattingWithUser) {
         setState {
             copy(startChattingState = Loading())
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
index 3b0fc175b0..4e3159b5b3 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
@@ -60,10 +60,10 @@ class MatrixToRoomSpaceFragment @Inject constructor(
             Uninitialized -> {
                 views.matrixToCardContentVisibility.isVisible = false
             }
-            is Loading -> {
+            is Loading    -> {
                 views.matrixToCardContentVisibility.isVisible = false
             }
-            is Success -> {
+            is Success    -> {
                 views.matrixToCardContentVisibility.isVisible = true
                 when (val peek = item.invoke()) {
                     is RoomInfoResult.FullInfo     -> {
@@ -154,7 +154,7 @@ class MatrixToRoomSpaceFragment @Inject constructor(
                     }
                 }
             }
-            is Fail -> {
+            is Fail       -> {
                 // TODO display some error copy?
                 sharedViewModel.handle(MatrixToAction.FailedToResolveUser)
             }
@@ -176,14 +176,14 @@ class MatrixToRoomSpaceFragment @Inject constructor(
             Uninitialized -> {
                 views.matrixToCardMainButton.render(ButtonStateView.State.Button)
             }
-            is Success -> {
+            is Success    -> {
                 views.matrixToCardMainButton.render(ButtonStateView.State.Button)
             }
-            is Fail -> {
+            is Fail       -> {
                 views.matrixToCardMainButton.render(ButtonStateView.State.Error)
                 // TODO display some error copy?
             }
-            is Loading -> {
+            is Loading    -> {
                 views.matrixToCardMainButton.render(ButtonStateView.State.Loading)
             }
         }
@@ -191,7 +191,7 @@ class MatrixToRoomSpaceFragment @Inject constructor(
 
     private fun mainButtonClicked() = withState(sharedViewModel) { state ->
         when (val info = state.roomPeekResult.invoke()) {
-            is RoomInfoResult.FullInfo -> {
+            is RoomInfoResult.FullInfo    -> {
                 when (info.membership) {
                     Membership.NONE,
                     Membership.INVITE,
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToUserFragment.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToUserFragment.kt
index 3792183bca..b0d68c57e8 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToUserFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToUserFragment.kt
@@ -60,16 +60,16 @@ class MatrixToUserFragment @Inject constructor(
             Uninitialized -> {
                 views.matrixToCardUserContentVisibility.isVisible = false
             }
-            is Loading -> {
+            is Loading    -> {
                 views.matrixToCardUserContentVisibility.isVisible = false
             }
-            is Success -> {
+            is Success    -> {
                 views.matrixToCardUserContentVisibility.isVisible = true
                 views.matrixToCardNameText.setTextOrHide(item.invoke().displayName)
                 views.matrixToCardUserIdText.setTextOrHide(item.invoke().id)
                 avatarRenderer.render(item.invoke(), views.matrixToCardAvatar)
             }
-            is Fail -> {
+            is Fail       -> {
                 // TODO display some error copy?
                 sharedViewModel.handle(MatrixToAction.FailedToResolveUser)
             }
@@ -80,17 +80,17 @@ class MatrixToUserFragment @Inject constructor(
                 views.matrixToCardButtonLoading.isVisible = false
                 views.matrixToCardSendMessageButton.isVisible = false
             }
-            is Success -> {
+            is Success    -> {
                 views.matrixToCardButtonLoading.isVisible = false
                 views.matrixToCardSendMessageButton.isVisible = true
             }
-            is Fail -> {
+            is Fail       -> {
                 views.matrixToCardButtonLoading.isVisible = false
                 views.matrixToCardSendMessageButton.isVisible = true
                 // TODO display some error copy?
                 sharedViewModel.handle(MatrixToAction.FailedToStartChatting)
             }
-            is Loading -> {
+            is Loading    -> {
                 views.matrixToCardButtonLoading.isVisible = true
                 views.matrixToCardSendMessageButton.isInvisible = true
             }
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/OriginOfMatrixTo.kt b/vector/src/main/java/im/vector/app/features/matrixto/OriginOfMatrixTo.kt
new file mode 100644
index 0000000000..297c8e7723
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/matrixto/OriginOfMatrixTo.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.matrixto
+
+import im.vector.app.features.analytics.plan.JoinedRoom
+import im.vector.app.features.analytics.plan.ViewRoom
+
+enum class OriginOfMatrixTo {
+    LINK,
+    NOTIFICATION,
+    TIMELINE,
+    SPACE_EXPLORE,
+    ROOM_LIST,
+    USER_CODE
+}
+
+fun OriginOfMatrixTo.toJoinedRoomTrigger(): JoinedRoom.Trigger? {
+    return when (this) {
+        OriginOfMatrixTo.LINK          -> JoinedRoom.Trigger.MobilePermalink
+        OriginOfMatrixTo.NOTIFICATION  -> JoinedRoom.Trigger.Notification
+        OriginOfMatrixTo.TIMELINE      -> JoinedRoom.Trigger.Timeline
+        OriginOfMatrixTo.SPACE_EXPLORE -> JoinedRoom.Trigger.SpaceHierarchy
+        OriginOfMatrixTo.ROOM_LIST     -> JoinedRoom.Trigger.RoomDirectory
+        OriginOfMatrixTo.USER_CODE     -> null
+    }
+}
+
+fun OriginOfMatrixTo.toViewRoomTrigger(): ViewRoom.Trigger? {
+    return when (this) {
+        OriginOfMatrixTo.LINK          -> ViewRoom.Trigger.MobilePermalink
+        OriginOfMatrixTo.NOTIFICATION  -> ViewRoom.Trigger.Notification
+        OriginOfMatrixTo.TIMELINE      -> ViewRoom.Trigger.Timeline
+        OriginOfMatrixTo.SPACE_EXPLORE -> ViewRoom.Trigger.SpaceHierarchy
+        OriginOfMatrixTo.ROOM_LIST     -> ViewRoom.Trigger.RoomDirectory
+        OriginOfMatrixTo.USER_CODE     -> null
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt b/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt
index 2f71089a39..b72b36a564 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/SpaceCardRenderer.kt
@@ -140,7 +140,8 @@ class SpaceCardRenderer @Inject constructor(
                 avatarRenderer.render(item, images[index])
             }
             inCard.peopleYouMayKnowText.setTextOrHide(
-                    stringProvider.getQuantityString(R.plurals.space_people_you_know,
+                    stringProvider.getQuantityString(
+                            R.plurals.space_people_you_know,
                             peopleYouKnow.count(),
                             peopleYouKnow.count()
                     )
diff --git a/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt b/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt
index b9d98429a7..29ec4f0629 100644
--- a/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt
@@ -23,6 +23,7 @@ import kotlinx.coroutines.CoroutineScope
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.util.MimeTypes
 import java.io.File
diff --git a/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt b/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
index cd868c9f2f..e18a13a3e6 100644
--- a/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
@@ -169,7 +169,8 @@ class RoomEventsAttachmentProvider(
                                 fileName = messageContent.body,
                                 mimeType = messageContent.mimeType,
                                 url = messageContent.getFileUrl(),
-                                elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt())
+                                elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt()
+                        )
                     }
                 }
     }
diff --git a/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
index d8c2b83f9b..2259eb513f 100644
--- a/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
@@ -53,6 +53,7 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.parcelize.Parcelize
+import org.matrix.android.sdk.api.session.getRoom
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -134,7 +135,7 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), AttachmentInt
             initialIndex = inMemoryData.indexOfFirst { it.eventId == args.eventId }.coerceAtLeast(0)
             dataSourceFactory.createProvider(inMemoryData, room, lifecycleScope)
         } else {
-            val events = room?.getAttachmentMessages().orEmpty()
+            val events = room?.timelineService()?.getAttachmentMessages().orEmpty()
             initialIndex = events.indexOfFirst { it.eventId == args.eventId }.coerceAtLeast(0)
             dataSourceFactory.createProvider(events, lifecycleScope)
         }
diff --git a/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt b/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
index 4e6d19686b..c7bb54fcf4 100644
--- a/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
@@ -87,7 +87,8 @@ class VideoContentRenderer @Inject constructor(private val localFilesHelper: Loc
                                         fileName = data.filename,
                                         mimeType = data.mimeType,
                                         url = data.url,
-                                        elementToDecrypt = data.elementToDecrypt)
+                                        elementToDecrypt = data.elementToDecrypt
+                                )
                     }
                     withContext(Dispatchers.Main) {
                         result.fold(
@@ -130,7 +131,8 @@ class VideoContentRenderer @Inject constructor(private val localFilesHelper: Loc
                                         fileName = data.filename,
                                         mimeType = data.mimeType,
                                         url = data.url,
-                                        elementToDecrypt = null)
+                                        elementToDecrypt = null
+                                )
                     }
                     withContext(Dispatchers.Main) {
                         result.fold(
diff --git a/vector/src/main/java/im/vector/app/features/media/domain/usecase/DownloadMediaUseCase.kt b/vector/src/main/java/im/vector/app/features/media/domain/usecase/DownloadMediaUseCase.kt
index b0401ccd30..6a24ac4fd7 100644
--- a/vector/src/main/java/im/vector/app/features/media/domain/usecase/DownloadMediaUseCase.kt
+++ b/vector/src/main/java/im/vector/app/features/media/domain/usecase/DownloadMediaUseCase.kt
@@ -20,6 +20,7 @@ import android.content.Context
 import androidx.core.net.toUri
 import dagger.hilt.android.qualifiers.ApplicationContext
 import im.vector.app.core.intent.getMimeTypeFromUri
+import im.vector.app.core.time.Clock
 import im.vector.app.core.utils.saveMedia
 import im.vector.app.features.notifications.NotificationUtils
 import kotlinx.coroutines.withContext
@@ -30,7 +31,8 @@ import javax.inject.Inject
 class DownloadMediaUseCase @Inject constructor(
         @ApplicationContext private val appContext: Context,
         private val session: Session,
-        private val notificationUtils: NotificationUtils
+        private val notificationUtils: NotificationUtils,
+        private val clock: Clock,
 ) {
 
     suspend fun execute(input: File): Result<Unit> = withContext(session.coroutineDispatchers.io) {
@@ -40,7 +42,8 @@ class DownloadMediaUseCase @Inject constructor(
                     file = input,
                     title = input.name,
                     mediaMimeType = getMimeTypeFromUri(appContext, input.toUri()),
-                    notificationUtils = notificationUtils
+                    notificationUtils = notificationUtils,
+                    currentTimeMillis = clock.epochMillis()
             )
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index 6122cf1eee..7cc42ec57f 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -39,6 +39,9 @@ import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.utils.toast
 import im.vector.app.features.VectorFeatures
 import im.vector.app.features.VectorFeatures.OnboardingVariant
+import im.vector.app.features.analytics.AnalyticsTracker
+import im.vector.app.features.analytics.extensions.toAnalyticsViewRoom
+import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.analytics.ui.consent.AnalyticsOptInActivity
 import im.vector.app.features.call.conference.JitsiCallViewModel
 import im.vector.app.features.call.conference.VectorJitsiActivity
@@ -68,6 +71,7 @@ import im.vector.app.features.location.LocationSharingMode
 import im.vector.app.features.login.LoginActivity
 import im.vector.app.features.login.LoginConfig
 import im.vector.app.features.matrixto.MatrixToBottomSheet
+import im.vector.app.features.matrixto.OriginOfMatrixTo
 import im.vector.app.features.media.AttachmentData
 import im.vector.app.features.media.BigImageViewerActivity
 import im.vector.app.features.media.VectorAttachmentViewerActivity
@@ -101,6 +105,8 @@ import im.vector.app.features.widgets.WidgetActivity
 import im.vector.app.features.widgets.WidgetArgsBuilder
 import im.vector.app.space
 import org.matrix.android.sdk.api.session.crypto.verification.IncomingSasVerificationTransaction
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.permalinks.PermalinkData
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoom
 import org.matrix.android.sdk.api.session.terms.TermsService
@@ -116,7 +122,8 @@ class DefaultNavigator @Inject constructor(
         private val widgetArgsBuilder: WidgetArgsBuilder,
         private val appStateHandler: AppStateHandler,
         private val supportedVerificationMethodsProvider: SupportedVerificationMethodsProvider,
-        private val features: VectorFeatures
+        private val features: VectorFeatures,
+        private val analyticsTracker: AnalyticsTracker
 ) : Navigator {
 
     override fun openLogin(context: Context, loginConfig: LoginConfig?, flags: Int) {
@@ -148,12 +155,23 @@ class DefaultNavigator @Inject constructor(
             roomId: String,
             eventId: String?,
             buildTask: Boolean,
-            isInviteAlreadyAccepted: Boolean
+            isInviteAlreadyAccepted: Boolean,
+            trigger: ViewRoom.Trigger?
     ) {
         if (sessionHolder.getSafeActiveSession()?.getRoom(roomId) == null) {
             fatalError("Trying to open an unknown room $roomId", vectorPreferences.failFast())
             return
         }
+
+        trigger?.let {
+            analyticsTracker.capture(
+                    sessionHolder.getActiveSession().getRoomSummary(roomId).toAnalyticsViewRoom(
+                            trigger = trigger,
+                            groupingMethod = appStateHandler.getCurrentRoomGroupingMethod()
+                    )
+            )
+        }
+
         val args = TimelineArgs(roomId = roomId, eventId = eventId, isInviteAlreadyAccepted = isInviteAlreadyAccepted)
         val intent = RoomDetailActivity.newIntent(context, args)
         startActivity(context, intent, buildTask)
@@ -176,7 +194,7 @@ class DefaultNavigator @Inject constructor(
             Navigator.PostSwitchSpaceAction.OpenAddExistingRooms -> {
                 startActivity(context, SpaceManageActivity.newIntent(context, spaceId, ManageType.AddRooms), false)
             }
-            Navigator.PostSwitchSpaceAction.OpenRoomList -> {
+            Navigator.PostSwitchSpaceAction.OpenRoomList         -> {
                 startActivity(context, SpaceExploreActivity.newIntent(context, spaceId), buildTask = false)
             }
             is Navigator.PostSwitchSpaceAction.OpenDefaultRoom   -> {
@@ -236,7 +254,8 @@ class DefaultNavigator @Inject constructor(
                 val pr = session.cryptoService().verificationService().requestKeyVerification(
                         supportedVerificationMethodsProvider.provide(),
                         session.myUserId,
-                        otherSessions)
+                        otherSessions
+                )
                 VerificationBottomSheet.forSelfVerification(session, pr.transactionId ?: pr.localId)
                         .show(context.supportFragmentManager, VerificationBottomSheet.WAITING_SELF_VERIF_TAG)
             } else {
@@ -294,13 +313,13 @@ class DefaultNavigator @Inject constructor(
         context.startActivity(intent)
     }
 
-    override fun openMatrixToBottomSheet(context: Context, link: String) {
+    override fun openMatrixToBottomSheet(context: Context, link: String, origin: OriginOfMatrixTo) {
         if (context is AppCompatActivity) {
             if (context !is MatrixToBottomSheet.InteractionListener) {
                 fatalError("Caller context should implement MatrixToBottomSheet.InteractionListener", vectorPreferences.failFast())
             }
             // TODO check if there is already one??
-            MatrixToBottomSheet.withLink(link)
+            MatrixToBottomSheet.withLink(link, origin)
                     .show(context.supportFragmentManager, "HA#MatrixToBottomSheet")
         }
     }
@@ -507,12 +526,14 @@ class DefaultNavigator @Inject constructor(
                                  view: View,
                                  inMemory: List<AttachmentData>,
                                  options: ((MutableList<Pair<View, String>>) -> Unit)?) {
-        VectorAttachmentViewerActivity.newIntent(activity,
+        VectorAttachmentViewerActivity.newIntent(
+                activity,
                 mediaData,
                 roomId,
                 mediaData.eventId,
                 inMemory,
-                ViewCompat.getTransitionName(view)).let { intent ->
+                ViewCompat.getTransitionName(view)
+        ).let { intent ->
             val pairs = ArrayList<Pair<View, String>>()
             activity.window.decorView.findViewById<View>(android.R.id.statusBarBackground)?.let {
                 pairs.add(Pair(it, Window.STATUS_BAR_BACKGROUND_TRANSITION_NAME))
@@ -581,23 +602,33 @@ class DefaultNavigator @Inject constructor(
     }
 
     override fun openThread(context: Context, threadTimelineArgs: ThreadTimelineArgs, eventIdToNavigate: String?) {
-        context.startActivity(ThreadsActivity.newIntent(
-                context = context,
-                threadTimelineArgs = threadTimelineArgs,
-                threadListArgs = null,
-                eventIdToNavigate = eventIdToNavigate
-        ))
+        context.startActivity(
+                ThreadsActivity.newIntent(
+                        context = context,
+                        threadTimelineArgs = threadTimelineArgs,
+                        threadListArgs = null,
+                        eventIdToNavigate = eventIdToNavigate
+                )
+        )
     }
 
     override fun openThreadList(context: Context, threadTimelineArgs: ThreadTimelineArgs) {
-        context.startActivity(ThreadsActivity.newIntent(
-                context = context,
-                threadTimelineArgs = null,
-                threadListArgs = ThreadListArgs(
-                        roomId = threadTimelineArgs.roomId,
-                        displayName = threadTimelineArgs.displayName,
-                        avatarUrl = threadTimelineArgs.avatarUrl,
-                        roomEncryptionTrustLevel = threadTimelineArgs.roomEncryptionTrustLevel
-                )))
+        context.startActivity(
+                ThreadsActivity.newIntent(
+                        context = context,
+                        threadTimelineArgs = null,
+                        threadListArgs = ThreadListArgs(
+                                roomId = threadTimelineArgs.roomId,
+                                displayName = threadTimelineArgs.displayName,
+                                avatarUrl = threadTimelineArgs.avatarUrl,
+                                roomEncryptionTrustLevel = threadTimelineArgs.roomEncryptionTrustLevel
+                        )
+                )
+        )
+    }
+
+    override fun openScreenSharingPermissionDialog(screenCaptureIntent: Intent,
+                                                   activityResultLauncher: ActivityResultLauncher<Intent>) {
+        activityResultLauncher.launch(screenCaptureIntent)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
index 310105bd95..075b41daf3 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
@@ -23,12 +23,14 @@ import android.net.Uri
 import android.view.View
 import androidx.activity.result.ActivityResultLauncher
 import androidx.core.util.Pair
+import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.crypto.recover.SetupMode
 import im.vector.app.features.displayname.getBestName
 import im.vector.app.features.home.room.threads.arguments.ThreadTimelineArgs
 import im.vector.app.features.location.LocationData
 import im.vector.app.features.location.LocationSharingMode
 import im.vector.app.features.login.LoginConfig
+import im.vector.app.features.matrixto.OriginOfMatrixTo
 import im.vector.app.features.media.AttachmentData
 import im.vector.app.features.pin.PinMode
 import im.vector.app.features.poll.PollMode
@@ -50,7 +52,12 @@ interface Navigator {
 
     fun softLogout(context: Context)
 
-    fun openRoom(context: Context, roomId: String, eventId: String? = null, buildTask: Boolean = false, isInviteAlreadyAccepted: Boolean = false)
+    fun openRoom(context: Context,
+                 roomId: String,
+                 eventId: String? = null,
+                 buildTask: Boolean = false,
+                 isInviteAlreadyAccepted: Boolean = false,
+                 trigger: ViewRoom.Trigger? = null)
 
     sealed class PostSwitchSpaceAction {
         object None : PostSwitchSpaceAction()
@@ -79,7 +86,7 @@ interface Navigator {
 
     fun openRoomPreview(context: Context, roomPreviewData: RoomPreviewData, fromEmailInviteLink: PermalinkData.RoomEmailInviteLink? = null)
 
-    fun openMatrixToBottomSheet(context: Context, link: String)
+    fun openMatrixToBottomSheet(context: Context, link: String, origin: OriginOfMatrixTo)
 
     fun openCreateRoom(context: Context, initialName: String = "", openAfterCreate: Boolean = true)
 
@@ -168,4 +175,9 @@ interface Navigator {
     fun openThread(context: Context, threadTimelineArgs: ThreadTimelineArgs, eventIdToNavigate: String? = null)
 
     fun openThreadList(context: Context, threadTimelineArgs: ThreadTimelineArgs)
+
+    fun openScreenSharingPermissionDialog(
+            screenCaptureIntent: Intent,
+            activityResultLauncher: ActivityResultLauncher<Intent>
+    )
 }
diff --git a/vector/src/main/java/im/vector/app/features/notifications/InviteNotifiableEvent.kt b/vector/src/main/java/im/vector/app/features/notifications/InviteNotifiableEvent.kt
index 832f97bc4e..eb0735f2be 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/InviteNotifiableEvent.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/InviteNotifiableEvent.kt
@@ -28,5 +28,6 @@ data class InviteNotifiableEvent(
         val type: String?,
         val timestamp: Long,
         val soundName: String?,
-        override val isRedacted: Boolean = false
+        override val isRedacted: Boolean = false,
+        override val isUpdated: Boolean = false
 ) : NotifiableEvent
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEvent.kt b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEvent.kt
index 52d8119cbb..a9ad79febf 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEvent.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEvent.kt
@@ -27,4 +27,5 @@ sealed interface NotifiableEvent : Serializable {
     // Used to know if event should be replaced with the one coming from eventstream
     val canBeReplaced: Boolean
     val isRedacted: Boolean
+    val isUpdated: Boolean
 }
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
index 855774e512..80f5f47b3b 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
@@ -20,6 +20,7 @@ import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.extensions.takeAs
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.time.Clock
 import im.vector.app.features.displayname.getBestName
 import im.vector.app.features.home.room.detail.timeline.format.DisplayableEventFormatter
 import im.vector.app.features.home.room.detail.timeline.format.NoticeEventFormatter
@@ -34,6 +35,10 @@ import org.matrix.android.sdk.api.session.events.model.isEdition
 import org.matrix.android.sdk.api.session.events.model.isImageMessage
 import org.matrix.android.sdk.api.session.events.model.supportsNotification
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.getRoomSummary
+import org.matrix.android.sdk.api.session.getUser
+import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageWithAttachmentContent
@@ -55,7 +60,8 @@ import javax.inject.Inject
 class NotifiableEventResolver @Inject constructor(
         private val stringProvider: StringProvider,
         private val noticeEventFormatter: NoticeEventFormatter,
-        private val displayableEventFormatter: DisplayableEventFormatter
+        private val displayableEventFormatter: DisplayableEventFormatter,
+        private val clock: Clock,
 ) {
 
     // private val eventDisplay = RiotEventDisplay(context)
@@ -83,7 +89,7 @@ class NotifiableEventResolver @Inject constructor(
                         eventId = event.eventId!!,
                         editedEventId = timelineEvent.getEditedEventId(),
                         noisy = false, // will be updated
-                        timestamp = event.originServerTs ?: System.currentTimeMillis(),
+                        timestamp = event.originServerTs ?: clock.epochMillis(),
                         description = bodyPreview,
                         title = stringProvider.getString(R.string.notification_unknown_new_event),
                         soundName = null,
@@ -100,7 +106,7 @@ class NotifiableEventResolver @Inject constructor(
         // Ignore message edition
         if (event.isEdition()) return null
 
-        val actions = session.getActions(event)
+        val actions = session.pushRuleService().getActions(event)
         val notificationAction = actions.toNotificationAction()
 
         return if (notificationAction.shouldNotify) {
@@ -175,15 +181,19 @@ class NotifiableEventResolver @Inject constructor(
                             roomName = roomName,
                             roomIsDirect = room.roomSummary()?.isDirect ?: false,
                             roomAvatarPath = session.contentUrlResolver()
-                                    .resolveThumbnail(room.roomSummary()?.avatarUrl,
+                                    .resolveThumbnail(
+                                            room.roomSummary()?.avatarUrl,
                                             250,
                                             250,
-                                            ContentUrlResolver.ThumbnailMethod.SCALE),
+                                            ContentUrlResolver.ThumbnailMethod.SCALE
+                                    ),
                             senderAvatarPath = session.contentUrlResolver()
-                                    .resolveThumbnail(event.senderInfo.avatarUrl,
+                                    .resolveThumbnail(
+                                            event.senderInfo.avatarUrl,
                                             250,
                                             250,
-                                            ContentUrlResolver.ThumbnailMethod.SCALE),
+                                            ContentUrlResolver.ThumbnailMethod.SCALE
+                                    ),
                             matrixID = session.myUserId,
                             soundName = null
                     )
@@ -233,7 +243,7 @@ class NotifiableEventResolver @Inject constructor(
     private fun resolveStateRoomEvent(event: Event, session: Session, canBeReplaced: Boolean, isNoisy: Boolean): NotifiableEvent? {
         val content = event.content?.toModel<RoomMemberContent>() ?: return null
         val roomId = event.roomId ?: return null
-        val dName = event.senderId?.let { session.getRoomMember(it, roomId)?.displayName }
+        val dName = event.senderId?.let { session.roomService().getRoomMember(it, roomId)?.displayName }
         if (Membership.INVITE == content.membership) {
             val roomSummary = session.getRoomSummary(roomId)
             val body = noticeEventFormatter.format(event, dName, isDm = roomSummary?.isDirect.orFalse())
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotifiableMessageEvent.kt b/vector/src/main/java/im/vector/app/features/notifications/NotifiableMessageEvent.kt
index 35718666b0..d13e41daa8 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotifiableMessageEvent.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotifiableMessageEvent.kt
@@ -38,7 +38,8 @@ data class NotifiableMessageEvent(
         // This is used for >N notification, as the result of a smart reply
         val outGoingMessage: Boolean = false,
         val outGoingMessageFailed: Boolean = false,
-        override val isRedacted: Boolean = false
+        override val isRedacted: Boolean = false,
+        override val isUpdated: Boolean = false
 ) : NotifiableEvent {
 
     val type: String = EventType.MESSAGE
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationAction.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationAction.kt
index c11ce6794f..86a9e917e5 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationAction.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationAction.kt
@@ -15,7 +15,7 @@
  */
 package im.vector.app.features.notifications
 
-import org.matrix.android.sdk.api.pushrules.Action
+import org.matrix.android.sdk.api.session.pushrules.Action
 
 data class NotificationAction(
         val shouldNotify: Boolean,
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
index 505f4cc4a0..4205f2ca5a 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
@@ -23,12 +23,15 @@ import androidx.core.app.RemoteInput
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.time.Clock
 import im.vector.app.features.analytics.AnalyticsTracker
 import im.vector.app.features.analytics.extensions.toAnalyticsJoinedRoom
+import im.vector.app.features.analytics.plan.JoinedRoom
 import im.vector.app.features.session.coroutineScope
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.read.ReadService
 import timber.log.Timber
@@ -44,6 +47,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
     @Inject lateinit var notificationDrawerManager: NotificationDrawerManager
     @Inject lateinit var activeSessionHolder: ActiveSessionHolder
     @Inject lateinit var analyticsTracker: AnalyticsTracker
+    @Inject lateinit var clock: Clock
 
     override fun onReceive(context: Context?, intent: Intent?) {
         if (intent == null || context == null) return
@@ -83,8 +87,8 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
             if (room != null) {
                 session.coroutineScope.launch {
                     tryOrNull {
-                        session.joinRoom(room.roomId)
-                        analyticsTracker.capture(room.roomSummary().toAnalyticsJoinedRoom())
+                        session.roomService().joinRoom(room.roomId)
+                        analyticsTracker.capture(room.roomSummary().toAnalyticsJoinedRoom(JoinedRoom.Trigger.Notification))
                     }
                 }
             }
@@ -94,7 +98,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
     private fun handleRejectRoom(roomId: String) {
         activeSessionHolder.getSafeActiveSession()?.let { session ->
             session.coroutineScope.launch {
-                tryOrNull { session.leaveRoom(roomId) }
+                tryOrNull { session.roomService().leaveRoom(roomId) }
             }
         }
     }
@@ -104,7 +108,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
             val room = session.getRoom(roomId)
             if (room != null) {
                 session.coroutineScope.launch {
-                    tryOrNull { room.markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT) }
+                    tryOrNull { room.readService().markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT) }
                 }
             }
         }
@@ -127,7 +131,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
     }
 
     private fun sendMatrixEvent(message: String, session: Session, room: Room, context: Context?) {
-        room.sendTextMessage(message)
+        room.sendService().sendTextMessage(message)
 
         // Create a new event to be displayed in the notification drawer, right now
 
@@ -136,8 +140,8 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
                 eventId = UUID.randomUUID().toString(),
                 editedEventId = null,
                 noisy = false,
-                timestamp = System.currentTimeMillis(),
-                senderName = session.getRoomMember(session.myUserId, room.roomId)?.displayName
+                timestamp = clock.epochMillis(),
+                senderName = session.roomService().getRoomMember(session.myUserId, room.roomId)?.displayName
                         ?: context?.getString(R.string.notification_sender_me),
                 senderId = session.myUserId,
                 body = message,
@@ -187,7 +191,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
                 val notifiableMessageEvent = NotifiableMessageEvent(
                         event.eventId,
                         false,
-                        System.currentTimeMillis(),
+                        clock.epochMillis(),
                         session.myUser?.displayname
                                 ?: context?.getString(R.string.notification_sender_me),
                         session.myUserId,
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
index fa56e3b8ed..1243d3f798 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
@@ -27,6 +27,7 @@ import im.vector.app.features.displayname.getBestName
 import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.content.ContentUrlResolver
+import org.matrix.android.sdk.api.session.getUser
 import org.matrix.android.sdk.api.util.toMatrixItem
 import timber.log.Timber
 import javax.inject.Inject
@@ -154,7 +155,8 @@ class NotificationDrawerManager @Inject constructor(
                         Timber.w(throwable, "refreshNotificationDrawerBg failure")
                     }
                 },
-                canHandle.waitMillis())
+                canHandle.waitMillis()
+        )
     }
 
     @WorkerThread
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationEventPersistence.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationEventPersistence.kt
index a4a7570fec..5a716ff173 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationEventPersistence.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationEventPersistence.kt
@@ -34,7 +34,7 @@ class NotificationEventPersistence @Inject constructor(private val context: Cont
             val file = File(context.applicationContext.cacheDir, ROOMS_NOTIFICATIONS_FILE_NAME)
             if (file.exists()) {
                 file.inputStream().use {
-                    val events: ArrayList<NotifiableEvent>? = currentSession?.loadSecureSecret(it, KEY_ALIAS_SECRET_STORAGE)
+                    val events: ArrayList<NotifiableEvent>? = currentSession?.secureStorageService()?.loadSecureSecret(it, KEY_ALIAS_SECRET_STORAGE)
                     if (events != null) {
                         return factory(events)
                     }
@@ -55,7 +55,7 @@ class NotificationEventPersistence @Inject constructor(private val context: Cont
             val file = File(context.applicationContext.cacheDir, ROOMS_NOTIFICATIONS_FILE_NAME)
             if (!file.exists()) file.createNewFile()
             FileOutputStream(file).use {
-                currentSession.securelyStoreObject(queuedEvents.rawEvents(), KEY_ALIAS_SECRET_STORAGE, it)
+                currentSession.secureStorageService().securelyStoreObject(queuedEvents.rawEvents(), KEY_ALIAS_SECRET_STORAGE, it)
             }
         } catch (e: Throwable) {
             Timber.e(e, "## Failed to save cached notification info")
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationEventQueue.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationEventQueue.kt
index 04506b218b..7c933c389d 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationEventQueue.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationEventQueue.kt
@@ -112,7 +112,13 @@ data class NotificationEventQueue(
 
     private fun replace(replace: NotifiableEvent, with: NotifiableEvent) {
         queue.remove(replace)
-        queue.add(with)
+        queue.add(
+                when (with) {
+                    is InviteNotifiableEvent  -> with.copy(isUpdated = true)
+                    is NotifiableMessageEvent -> with.copy(isUpdated = true)
+                    is SimpleNotifiableEvent  -> with.copy(isUpdated = true)
+                }
+        )
     }
 
     fun clearMemberShipNotificationForRoom(roomId: String) {
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationFactory.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationFactory.kt
index b95bbe1bf5..4b6815e7e4 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationFactory.kt
@@ -96,7 +96,8 @@ class NotificationFactory @Inject constructor(
                             invitationNotifications = invitationMeta,
                             simpleNotifications = simpleMeta,
                             useCompleteNotificationFormat = useCompleteNotificationFormat
-                    ))
+                    )
+            )
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
index 161b58d53d..78d771ee1c 100755
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
@@ -51,6 +51,7 @@ import im.vector.app.core.extensions.createIgnoredUri
 import im.vector.app.core.platform.PendingIntentCompat
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.services.CallService
+import im.vector.app.core.time.Clock
 import im.vector.app.core.utils.startNotificationChannelSettingsIntent
 import im.vector.app.features.call.VectorCallActivity
 import im.vector.app.features.call.service.CallHeadsUpActionReceiver
@@ -72,9 +73,12 @@ import kotlin.random.Random
  * Note: Cannot inject ColorProvider in the constructor, because it requires an Activity
  */
 @Singleton
-class NotificationUtils @Inject constructor(private val context: Context,
-                                            private val stringProvider: StringProvider,
-                                            private val vectorPreferences: VectorPreferences) {
+class NotificationUtils @Inject constructor(
+        private val context: Context,
+        private val stringProvider: StringProvider,
+        private val vectorPreferences: VectorPreferences,
+        private val clock: Clock,
+) {
 
     companion object {
         /* ==========================================================================================
@@ -170,9 +174,11 @@ class NotificationUtils @Inject constructor(private val context: Context,
          * Default notification importance: shows everywhere, makes noise, but does not visually
          * intrude.
          */
-        notificationManager.createNotificationChannel(NotificationChannel(NOISY_NOTIFICATION_CHANNEL_ID,
+        notificationManager.createNotificationChannel(NotificationChannel(
+                NOISY_NOTIFICATION_CHANNEL_ID,
                 stringProvider.getString(R.string.notification_noisy_notifications).ifEmpty { "Noisy notifications" },
-                NotificationManager.IMPORTANCE_DEFAULT)
+                NotificationManager.IMPORTANCE_DEFAULT
+        )
                 .apply {
                     description = stringProvider.getString(R.string.notification_noisy_notifications)
                     enableVibration(true)
@@ -183,9 +189,11 @@ class NotificationUtils @Inject constructor(private val context: Context,
         /**
          * Low notification importance: shows everywhere, but is not intrusive.
          */
-        notificationManager.createNotificationChannel(NotificationChannel(SILENT_NOTIFICATION_CHANNEL_ID,
+        notificationManager.createNotificationChannel(NotificationChannel(
+                SILENT_NOTIFICATION_CHANNEL_ID,
                 stringProvider.getString(R.string.notification_silent_notifications).ifEmpty { "Silent notifications" },
-                NotificationManager.IMPORTANCE_LOW)
+                NotificationManager.IMPORTANCE_LOW
+        )
                 .apply {
                     description = stringProvider.getString(R.string.notification_silent_notifications)
                     setSound(null, null)
@@ -193,18 +201,22 @@ class NotificationUtils @Inject constructor(private val context: Context,
                     lightColor = accentColor
                 })
 
-        notificationManager.createNotificationChannel(NotificationChannel(LISTENING_FOR_EVENTS_NOTIFICATION_CHANNEL_ID,
+        notificationManager.createNotificationChannel(NotificationChannel(
+                LISTENING_FOR_EVENTS_NOTIFICATION_CHANNEL_ID,
                 stringProvider.getString(R.string.notification_listening_for_events).ifEmpty { "Listening for events" },
-                NotificationManager.IMPORTANCE_MIN)
+                NotificationManager.IMPORTANCE_MIN
+        )
                 .apply {
                     description = stringProvider.getString(R.string.notification_listening_for_events)
                     setSound(null, null)
                     setShowBadge(false)
                 })
 
-        notificationManager.createNotificationChannel(NotificationChannel(CALL_NOTIFICATION_CHANNEL_ID,
+        notificationManager.createNotificationChannel(NotificationChannel(
+                CALL_NOTIFICATION_CHANNEL_ID,
                 stringProvider.getString(R.string.call).ifEmpty { "Call" },
-                NotificationManager.IMPORTANCE_HIGH)
+                NotificationManager.IMPORTANCE_HIGH
+        )
                 .apply {
                     description = stringProvider.getString(R.string.call)
                     setSound(null, null)
@@ -262,11 +274,13 @@ class NotificationUtils @Inject constructor(private val context: Context,
             // reflection at runtime, to avoid compiler error: "Cannot resolve method.."
             try {
                 val deprecatedMethod = notification.javaClass
-                        .getMethod("setLatestEventInfo",
+                        .getMethod(
+                                "setLatestEventInfo",
                                 Context::class.java,
                                 CharSequence::class.java,
                                 CharSequence::class.java,
-                                PendingIntent::class.java)
+                                PendingIntent::class.java
+                        )
                 deprecatedMethod.invoke(notification, context, stringProvider.getString(R.string.app_name), stringProvider.getString(subTitleResId), pi)
             } catch (ex: Exception) {
                 Timber.e(ex, "## buildNotification(): Exception - setLatestEventInfo() Msg=")
@@ -323,7 +337,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
         }
         val contentPendingIntent = PendingIntent.getActivity(
                 context,
-                System.currentTimeMillis().toInt(),
+                clock.epochMillis().toInt(),
                 contentIntent,
                 PendingIntentCompat.FLAG_IMMUTABLE
         )
@@ -337,7 +351,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
                                 mode = VectorCallActivity.INCOMING_ACCEPT
                         )
                 )
-                .getPendingIntent(System.currentTimeMillis().toInt(), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE)
+                .getPendingIntent(clock.epochMillis().toInt(), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE)
 
         val rejectCallPendingIntent = buildRejectCallPendingIntent(call.callId)
 
@@ -386,13 +400,14 @@ class NotificationUtils @Inject constructor(private val context: Context,
         val contentIntent = VectorCallActivity.newIntent(
                 context = context,
                 call = call,
-                mode = null).apply {
+                mode = null
+        ).apply {
             flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
             data = createIgnoredUri(call.callId)
         }
         val contentPendingIntent = PendingIntent.getActivity(
                 context,
-                System.currentTimeMillis().toInt(),
+                clock.epochMillis().toInt(),
                 contentIntent,
                 PendingIntentCompat.FLAG_IMMUTABLE
         )
@@ -453,7 +468,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
         val contentPendingIntent = TaskStackBuilder.create(context)
                 .addNextIntentWithParentStack(HomeActivity.newIntent(context))
                 .addNextIntent(VectorCallActivity.newIntent(context, call, null))
-                .getPendingIntent(System.currentTimeMillis().toInt(), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE)
+                .getPendingIntent(clock.epochMillis().toInt(), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE)
 
         builder.setContentIntent(contentPendingIntent)
 
@@ -467,7 +482,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
         }
         return PendingIntent.getBroadcast(
                 context,
-                System.currentTimeMillis().toInt(),
+                clock.epochMillis().toInt(),
                 rejectCallActionReceiver,
                 PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
         )
@@ -515,7 +530,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
         val contentPendingIntent = TaskStackBuilder.create(context)
                 .addNextIntentWithParentStack(HomeActivity.newIntent(context))
                 .addNextIntent(RoomDetailActivity.newIntent(context, TimelineArgs(callInformation.nativeRoomId)))
-                .getPendingIntent(System.currentTimeMillis().toInt(), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE)
+                .getPendingIntent(clock.epochMillis().toInt(), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE)
 
         builder.setContentIntent(contentPendingIntent)
         return builder.build()
@@ -535,6 +550,20 @@ class NotificationUtils @Inject constructor(private val context: Context,
                 .build()
     }
 
+    /**
+     * Creates a notification that indicates the application is capturing the screen.
+     */
+    fun buildScreenSharingNotification(): Notification {
+        return NotificationCompat.Builder(context, SILENT_NOTIFICATION_CHANNEL_ID)
+                .setContentTitle(stringProvider.getString(R.string.screen_sharing_notification_title))
+                .setContentText(stringProvider.getString(R.string.screen_sharing_notification_description))
+                .setSmallIcon(R.drawable.ic_share_screen)
+                .setColor(ThemeUtils.getColor(context, android.R.attr.colorPrimary))
+                .setCategory(NotificationCompat.CATEGORY_SERVICE)
+                .setContentIntent(buildOpenHomePendingIntentForSummary())
+                .build()
+    }
+
     fun buildDownloadFileNotification(uri: Uri, fileName: String, mimeType: String): Notification {
         return NotificationCompat.Builder(context, SILENT_NOTIFICATION_CHANNEL_ID)
                 .setGroup(stringProvider.getString(R.string.app_name))
@@ -548,7 +577,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
                     }
                     PendingIntent.getActivity(
                             context,
-                            System.currentTimeMillis().toInt(),
+                            clock.epochMillis().toInt(),
                             intent,
                             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
                     ).let {
@@ -574,7 +603,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
 
         val channelID = if (roomInfo.shouldBing) NOISY_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID
         return NotificationCompat.Builder(context, channelID)
-                .setOnlyAlertOnce(true)
+                .setOnlyAlertOnce(roomInfo.isUpdated)
                 .setWhen(lastMessageTimestamp)
                 // MESSAGING_STYLE sets title and content for API 16 and above devices.
                 .setStyle(messageStyle)
@@ -622,13 +651,15 @@ class NotificationUtils @Inject constructor(private val context: Context,
                     markRoomReadIntent.putExtra(NotificationBroadcastReceiver.KEY_ROOM_ID, roomInfo.roomId)
                     val markRoomReadPendingIntent = PendingIntent.getBroadcast(
                             context,
-                            System.currentTimeMillis().toInt(),
+                            clock.epochMillis().toInt(),
                             markRoomReadIntent,
                             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
                     )
 
-                    NotificationCompat.Action.Builder(R.drawable.ic_material_done_all_white,
-                            stringProvider.getString(R.string.action_mark_room_read), markRoomReadPendingIntent)
+                    NotificationCompat.Action.Builder(
+                            R.drawable.ic_material_done_all_white,
+                            stringProvider.getString(R.string.action_mark_room_read), markRoomReadPendingIntent
+                    )
                             .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MARK_AS_READ)
                             .setShowsUserInterface(false)
                             .build()
@@ -640,8 +671,10 @@ class NotificationUtils @Inject constructor(private val context: Context,
                             val remoteInput = RemoteInput.Builder(NotificationBroadcastReceiver.KEY_TEXT_REPLY)
                                     .setLabel(stringProvider.getString(R.string.action_quick_reply))
                                     .build()
-                            NotificationCompat.Action.Builder(R.drawable.vector_notification_quick_reply,
-                                    stringProvider.getString(R.string.action_quick_reply), replyPendingIntent)
+                            NotificationCompat.Action.Builder(
+                                    R.drawable.vector_notification_quick_reply,
+                                    stringProvider.getString(R.string.action_quick_reply), replyPendingIntent
+                            )
                                     .addRemoteInput(remoteInput)
                                     .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_REPLY)
                                     .setShowsUserInterface(false)
@@ -663,7 +696,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
                     intent.action = DISMISS_ROOM_NOTIF_ACTION
                     val pendingIntent = PendingIntent.getBroadcast(
                             context.applicationContext,
-                            System.currentTimeMillis().toInt(),
+                            clock.epochMillis().toInt(),
                             intent,
                             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
                     )
@@ -698,7 +731,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
                     rejectIntent.putExtra(NotificationBroadcastReceiver.KEY_ROOM_ID, roomId)
                     val rejectIntentPendingIntent = PendingIntent.getBroadcast(
                             context,
-                            System.currentTimeMillis().toInt(),
+                            clock.epochMillis().toInt(),
                             rejectIntent,
                             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
                     )
@@ -716,7 +749,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
                     joinIntent.putExtra(NotificationBroadcastReceiver.KEY_ROOM_ID, roomId)
                     val joinIntentPendingIntent = PendingIntent.getBroadcast(
                             context,
-                            System.currentTimeMillis().toInt(),
+                            clock.epochMillis().toInt(),
                             joinIntent,
                             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
                     )
@@ -797,7 +830,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
                 .addNextIntentWithParentStack(HomeActivity.newIntent(context))
                 .addNextIntent(roomIntentTap)
                 .getPendingIntent(
-                        System.currentTimeMillis().toInt(),
+                        clock.epochMillis().toInt(),
                         PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
                 )
     }
@@ -830,7 +863,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
             intent.putExtra(NotificationBroadcastReceiver.KEY_ROOM_ID, roomId)
             return PendingIntent.getBroadcast(
                     context,
-                    System.currentTimeMillis().toInt(),
+                    clock.epochMillis().toInt(),
                     intent,
                     // PendingIntents attached to actions with remote inputs must be mutable
                     PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_MUTABLE
diff --git a/vector/src/main/java/im/vector/app/features/notifications/OutdatedEventDetector.kt b/vector/src/main/java/im/vector/app/features/notifications/OutdatedEventDetector.kt
index c6ef616afe..bb45d74708 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/OutdatedEventDetector.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/OutdatedEventDetector.kt
@@ -16,6 +16,7 @@
 package im.vector.app.features.notifications
 
 import im.vector.app.ActiveSessionDataSource
+import org.matrix.android.sdk.api.session.getRoom
 import javax.inject.Inject
 
 class OutdatedEventDetector @Inject constructor(
@@ -34,7 +35,7 @@ class OutdatedEventDetector @Inject constructor(
             val eventID = notifiableEvent.eventId
             val roomID = notifiableEvent.roomId
             val room = session.getRoom(roomID) ?: return false
-            return room.isEventRead(eventID)
+            return room.readService().isEventRead(eventID)
         }
         return false
     }
diff --git a/vector/src/main/java/im/vector/app/features/notifications/PushRuleTriggerListener.kt b/vector/src/main/java/im/vector/app/features/notifications/PushRuleTriggerListener.kt
index cd08820fc1..58f895bf0c 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/PushRuleTriggerListener.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/PushRuleTriggerListener.kt
@@ -21,10 +21,10 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.pushrules.PushEvents
-import org.matrix.android.sdk.api.pushrules.PushRuleService
-import org.matrix.android.sdk.api.pushrules.getActions
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.pushrules.PushEvents
+import org.matrix.android.sdk.api.session.pushrules.PushRuleService
+import org.matrix.android.sdk.api.session.pushrules.getActions
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -71,12 +71,12 @@ class PushRuleTriggerListener @Inject constructor(
             stop()
         }
         this.session = session
-        session.addPushRuleListener(this)
+        session.pushRuleService().addPushRuleListener(this)
     }
 
     fun stop() {
         scope.coroutineContext.cancelChildren(CancellationException("PushRuleTriggerListener stopping"))
-        session?.removePushRuleListener(this)
+        session?.pushRuleService()?.removePushRuleListener(this)
         session = null
         notificationDrawerManager.clearAllEvents()
     }
diff --git a/vector/src/main/java/im/vector/app/features/notifications/RoomEventGroupInfo.kt b/vector/src/main/java/im/vector/app/features/notifications/RoomEventGroupInfo.kt
index 64e40ed748..6ec4645382 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/RoomEventGroupInfo.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/RoomEventGroupInfo.kt
@@ -31,4 +31,5 @@ data class RoomEventGroupInfo(
     var shouldBing: Boolean = false
     var customSound: String? = null
     var hasSmartReplyError: Boolean = false
+    var isUpdated: Boolean = false
 }
diff --git a/vector/src/main/java/im/vector/app/features/notifications/RoomGroupMessageCreator.kt b/vector/src/main/java/im/vector/app/features/notifications/RoomGroupMessageCreator.kt
index 8310c15daa..aa54176815 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/RoomGroupMessageCreator.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/RoomGroupMessageCreator.kt
@@ -36,11 +36,12 @@ class RoomGroupMessageCreator @Inject constructor(
         val firstKnownRoomEvent = events[0]
         val roomName = firstKnownRoomEvent.roomName ?: firstKnownRoomEvent.senderName ?: ""
         val roomIsGroup = !firstKnownRoomEvent.roomIsDirect
-        val style = NotificationCompat.MessagingStyle(Person.Builder()
-                .setName(userDisplayName)
-                .setIcon(bitmapLoader.getUserIcon(userAvatarUrl))
-                .setKey(firstKnownRoomEvent.matrixID)
-                .build()
+        val style = NotificationCompat.MessagingStyle(
+                Person.Builder()
+                        .setName(userDisplayName)
+                        .setIcon(bitmapLoader.getUserIcon(userAvatarUrl))
+                        .setKey(firstKnownRoomEvent.matrixID)
+                        .build()
         ).also {
             it.conversationTitle = roomName.takeIf { roomIsGroup }
             it.isGroupConversation = roomIsGroup
@@ -72,6 +73,7 @@ class RoomGroupMessageCreator @Inject constructor(
                             it.hasSmartReplyError = smartReplyErrors.isNotEmpty()
                             it.shouldBing = meta.shouldBing
                             it.customSound = events.last().soundName
+                            it.isUpdated = events.last().isUpdated
                         },
                         largeIcon = largeBitmap,
                         lastMessageTimestamp,
diff --git a/vector/src/main/java/im/vector/app/features/notifications/SimpleNotifiableEvent.kt b/vector/src/main/java/im/vector/app/features/notifications/SimpleNotifiableEvent.kt
index 8c72372204..a58f22087d 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/SimpleNotifiableEvent.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/SimpleNotifiableEvent.kt
@@ -26,5 +26,6 @@ data class SimpleNotifiableEvent(
         val timestamp: Long,
         val soundName: String?,
         override var canBeReplaced: Boolean,
-        override val isRedacted: Boolean = false
+        override val isRedacted: Boolean = false,
+        override val isUpdated: Boolean = false
 ) : NotifiableEvent
diff --git a/vector/src/main/java/im/vector/app/features/notifications/SummaryGroupMessageCreator.kt b/vector/src/main/java/im/vector/app/features/notifications/SummaryGroupMessageCreator.kt
index 91163434c2..7d1cb074ec 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/SummaryGroupMessageCreator.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/SummaryGroupMessageCreator.kt
@@ -99,12 +99,16 @@ class SummaryGroupMessageCreator @Inject constructor(
             val invitationsStr = stringProvider.getQuantityString(R.plurals.notification_invitations, invitationEventsCount, invitationEventsCount)
             if (messageNotificationCount > 0) {
                 // Invitation and message
-                val messageStr = stringProvider.getQuantityString(R.plurals.room_new_messages_notification,
-                        messageNotificationCount, messageNotificationCount)
+                val messageStr = stringProvider.getQuantityString(
+                        R.plurals.room_new_messages_notification,
+                        messageNotificationCount, messageNotificationCount
+                )
                 if (roomCount > 1) {
                     // In several rooms
-                    val roomStr = stringProvider.getQuantityString(R.plurals.notification_unread_notified_messages_in_room_rooms,
-                            roomCount, roomCount)
+                    val roomStr = stringProvider.getQuantityString(
+                            R.plurals.notification_unread_notified_messages_in_room_rooms,
+                            roomCount, roomCount
+                    )
                     stringProvider.getString(
                             R.string.notification_unread_notified_messages_in_room_and_invitation,
                             messageStr,
@@ -125,8 +129,10 @@ class SummaryGroupMessageCreator @Inject constructor(
             }
         } else {
             // No invitation, only messages
-            val messageStr = stringProvider.getQuantityString(R.plurals.room_new_messages_notification,
-                    messageNotificationCount, messageNotificationCount)
+            val messageStr = stringProvider.getQuantityString(
+                    R.plurals.room_new_messages_notification,
+                    messageNotificationCount, messageNotificationCount
+            )
             if (roomCount > 1) {
                 // In several rooms
                 val roomStr = stringProvider.getQuantityString(R.plurals.notification_unread_notified_messages_in_room_rooms, roomCount, roomCount)
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/Login2Variant.kt b/vector/src/main/java/im/vector/app/features/onboarding/Login2Variant.kt
index 163af5d8d1..9f63ff3e22 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/Login2Variant.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/Login2Variant.kt
@@ -41,7 +41,6 @@ import im.vector.app.features.login.LoginWaitForEmailFragmentArgument
 import im.vector.app.features.login.TextInputFormFragmentMode
 import im.vector.app.features.login.isSupported
 import im.vector.app.features.login.terms.LoginTermsFragmentArgument
-import im.vector.app.features.login.terms.toLocalizedLoginTerms
 import im.vector.app.features.login2.LoginAction2
 import im.vector.app.features.login2.LoginCaptchaFragment2
 import im.vector.app.features.login2.LoginFragmentSigninPassword2
@@ -66,6 +65,7 @@ import im.vector.app.features.login2.created.AccountCreatedFragment
 import im.vector.app.features.login2.terms.LoginTermsFragment2
 import org.matrix.android.sdk.api.auth.registration.FlowResult
 import org.matrix.android.sdk.api.auth.registration.Stage
+import org.matrix.android.sdk.api.auth.toLocalizedLoginTerms
 import org.matrix.android.sdk.api.extensions.tryOrNull
 
 private const val FRAGMENT_REGISTRATION_STAGE_TAG = "FRAGMENT_REGISTRATION_STAGE_TAG"
@@ -169,9 +169,11 @@ class Login2Variant(
                             // ft.setCustomAnimations(enterAnim, exitAnim, popEnterAnim, popExitAnim)
                         })
             is LoginViewEvents2.OpenHomeServerUrlFormScreen                -> {
-                activity.addFragmentToBackstack(views.loginFragmentContainer,
+                activity.addFragmentToBackstack(
+                        views.loginFragmentContainer,
                         LoginServerUrlFormFragment2::class.java,
-                        option = commonOption)
+                        option = commonOption
+                )
             }
             is LoginViewEvents2.OpenSignInEnterIdentifierScreen            -> {
                 activity.addFragmentToBackstack(views.loginFragmentContainer,
@@ -187,67 +189,87 @@ class Login2Variant(
                         })
             }
             is LoginViewEvents2.OpenSsoOnlyScreen                          -> {
-                activity.addFragmentToBackstack(views.loginFragmentContainer,
+                activity.addFragmentToBackstack(
+                        views.loginFragmentContainer,
                         LoginSsoOnlyFragment2::class.java,
-                        option = commonOption)
+                        option = commonOption
+                )
             }
             is LoginViewEvents2.OnWebLoginError                            -> onWebLoginError(event)
             is LoginViewEvents2.OpenResetPasswordScreen                    ->
-                activity.addFragmentToBackstack(views.loginFragmentContainer,
+                activity.addFragmentToBackstack(
+                        views.loginFragmentContainer,
                         LoginResetPasswordFragment2::class.java,
-                        option = commonOption)
+                        option = commonOption
+                )
             is LoginViewEvents2.OnResetPasswordSendThreePidDone            -> {
                 supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
-                activity.addFragmentToBackstack(views.loginFragmentContainer,
+                activity.addFragmentToBackstack(
+                        views.loginFragmentContainer,
                         LoginResetPasswordMailConfirmationFragment2::class.java,
-                        option = commonOption)
+                        option = commonOption
+                )
             }
             is LoginViewEvents2.OnResetPasswordMailConfirmationSuccess     -> {
                 supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
-                activity.addFragmentToBackstack(views.loginFragmentContainer,
+                activity.addFragmentToBackstack(
+                        views.loginFragmentContainer,
                         LoginResetPasswordSuccessFragment2::class.java,
-                        option = commonOption)
+                        option = commonOption
+                )
             }
             is LoginViewEvents2.OnResetPasswordMailConfirmationSuccessDone -> {
                 // Go back to the login fragment
                 supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
             }
             is LoginViewEvents2.OnSendEmailSuccess                         ->
-                activity.addFragmentToBackstack(views.loginFragmentContainer,
+                activity.addFragmentToBackstack(
+                        views.loginFragmentContainer,
                         LoginWaitForEmailFragment2::class.java,
                         LoginWaitForEmailFragmentArgument(event.email),
                         tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                        option = commonOption)
+                        option = commonOption
+                )
             is LoginViewEvents2.OpenSigninPasswordScreen                   -> {
-                activity.addFragmentToBackstack(views.loginFragmentContainer,
+                activity.addFragmentToBackstack(
+                        views.loginFragmentContainer,
                         LoginFragmentSigninPassword2::class.java,
                         tag = FRAGMENT_LOGIN_TAG,
-                        option = commonOption)
+                        option = commonOption
+                )
             }
             is LoginViewEvents2.OpenSignupPasswordScreen                   -> {
-                activity.addFragmentToBackstack(views.loginFragmentContainer,
+                activity.addFragmentToBackstack(
+                        views.loginFragmentContainer,
                         LoginFragmentSignupPassword2::class.java,
                         tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                        option = commonOption)
+                        option = commonOption
+                )
             }
             is LoginViewEvents2.OpenSignUpChooseUsernameScreen             -> {
-                activity.addFragmentToBackstack(views.loginFragmentContainer,
+                activity.addFragmentToBackstack(
+                        views.loginFragmentContainer,
                         LoginFragmentSignupUsername2::class.java,
                         tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                        option = commonOption)
+                        option = commonOption
+                )
             }
             is LoginViewEvents2.OpenSignInWithAnythingScreen               -> {
-                activity.addFragmentToBackstack(views.loginFragmentContainer,
+                activity.addFragmentToBackstack(
+                        views.loginFragmentContainer,
                         LoginFragmentToAny2::class.java,
                         tag = FRAGMENT_LOGIN_TAG,
-                        option = commonOption)
+                        option = commonOption
+                )
             }
             is LoginViewEvents2.OnSendMsisdnSuccess                        ->
-                activity.addFragmentToBackstack(views.loginFragmentContainer,
+                activity.addFragmentToBackstack(
+                        views.loginFragmentContainer,
                         LoginGenericTextInputFormFragment2::class.java,
                         LoginGenericTextInputFormFragmentArgument(TextInputFormFragmentMode.ConfirmMsisdn, true, event.msisdn),
                         tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                        option = commonOption)
+                        option = commonOption
+                )
             is LoginViewEvents2.Failure                                    ->
                 // This is handled by the Fragments
                 Unit
@@ -268,9 +290,11 @@ class Login2Variant(
         if (event.newAccount) {
             // Propose to set avatar and display name
             // Back on this Fragment will finish the Activity
-            activity.addFragmentToBackstack(views.loginFragmentContainer,
+            activity.addFragmentToBackstack(
+                    views.loginFragmentContainer,
                     AccountCreatedFragment::class.java,
-                    option = commonOption)
+                    option = commonOption
+            )
         } else {
             terminate(false)
         }
@@ -321,9 +345,11 @@ class Login2Variant(
                 .setTitle(R.string.app_name)
                 .setMessage(activity.getString(R.string.login_registration_not_supported))
                 .setPositiveButton(R.string.yes) { _, _ ->
-                    activity.addFragmentToBackstack(views.loginFragmentContainer,
+                    activity.addFragmentToBackstack(
+                            views.loginFragmentContainer,
                             LoginWebFragment2::class.java,
-                            option = commonOption)
+                            option = commonOption
+                    )
                 }
                 .setNegativeButton(R.string.no, null)
                 .show()
@@ -334,9 +360,11 @@ class Login2Variant(
                 .setTitle(R.string.app_name)
                 .setMessage(activity.getString(R.string.login_mode_not_supported, supportedTypes.joinToString { "'$it'" }))
                 .setPositiveButton(R.string.yes) { _, _ ->
-                    activity.addFragmentToBackstack(views.loginFragmentContainer,
+                    activity.addFragmentToBackstack(
+                            views.loginFragmentContainer,
                             LoginWebFragment2::class.java,
-                            option = commonOption)
+                            option = commonOption
+                    )
                 }
                 .setNegativeButton(R.string.no, null)
                 .show()
@@ -364,26 +392,34 @@ class Login2Variant(
         supportFragmentManager.popBackStack(FRAGMENT_REGISTRATION_STAGE_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
 
         when (stage) {
-            is Stage.ReCaptcha -> activity.addFragmentToBackstack(views.loginFragmentContainer,
+            is Stage.ReCaptcha -> activity.addFragmentToBackstack(
+                    views.loginFragmentContainer,
                     LoginCaptchaFragment2::class.java,
                     LoginCaptchaFragmentArgument(stage.publicKey),
                     tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                    option = commonOption)
-            is Stage.Email     -> activity.addFragmentToBackstack(views.loginFragmentContainer,
+                    option = commonOption
+            )
+            is Stage.Email     -> activity.addFragmentToBackstack(
+                    views.loginFragmentContainer,
                     LoginGenericTextInputFormFragment2::class.java,
                     LoginGenericTextInputFormFragmentArgument(TextInputFormFragmentMode.SetEmail, stage.mandatory),
                     tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                    option = commonOption)
-            is Stage.Msisdn    -> activity.addFragmentToBackstack(views.loginFragmentContainer,
+                    option = commonOption
+            )
+            is Stage.Msisdn    -> activity.addFragmentToBackstack(
+                    views.loginFragmentContainer,
                     LoginGenericTextInputFormFragment2::class.java,
                     LoginGenericTextInputFormFragmentArgument(TextInputFormFragmentMode.SetMsisdn, stage.mandatory),
                     tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                    option = commonOption)
-            is Stage.Terms     -> activity.addFragmentToBackstack(views.loginFragmentContainer,
+                    option = commonOption
+            )
+            is Stage.Terms     -> activity.addFragmentToBackstack(
+                    views.loginFragmentContainer,
                     LoginTermsFragment2::class.java,
                     LoginTermsFragmentArgument(stage.policies.toLocalizedLoginTerms(activity.getString(R.string.resources_language))),
                     tag = FRAGMENT_REGISTRATION_STAGE_TAG,
-                    option = commonOption)
+                    option = commonOption
+            )
             else               -> Unit // Should not happen
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
index 2b286e6d93..25ae0327a8 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
@@ -562,7 +562,7 @@ class OnboardingViewModel @AssistedInject constructor(
     private suspend fun createPersonalizationState(session: Session, state: OnboardingViewState): PersonalizationState {
         return when {
             vectorFeatures.isOnboardingPersonalizeEnabled() -> {
-                val homeServerCapabilities = session.getHomeServerCapabilities()
+                val homeServerCapabilities = session.homeServerCapabilitiesService().getHomeServerCapabilities()
                 val capabilityOverrides = vectorOverrides.forceHomeserverCapabilities?.firstOrNull()
                 state.personalizationState.copy(
                         supportsChangingDisplayName = capabilityOverrides?.canChangeDisplayName ?: homeServerCapabilities.canChangeDisplayName,
@@ -645,7 +645,7 @@ class OnboardingViewModel @AssistedInject constructor(
                     when (awaitState().onboardingFlow) {
                         OnboardingFlow.SignIn -> {
                             updateSignMode(SignMode.SignIn)
-                            internalRegisterAction(RegisterAction.StartRegistration, ::emitFlowResultViewEvent)
+                            _viewEvents.post(OnboardingViewEvents.OnSignModeSelected(SignMode.SignIn))
                         }
                         OnboardingFlow.SignUp -> {
                             updateSignMode(SignMode.SignUp)
@@ -705,7 +705,7 @@ class OnboardingViewModel @AssistedInject constructor(
         viewModelScope.launch {
             val activeSession = activeSessionHolder.getActiveSession()
             try {
-                activeSession.setDisplayName(activeSession.myUserId, displayName)
+                activeSession.profileService().setDisplayName(activeSession.myUserId, displayName)
                 setState {
                     copy(
                             isLoading = false,
@@ -760,7 +760,7 @@ class OnboardingViewModel @AssistedInject constructor(
                     viewModelScope.launch {
                         val activeSession = activeSessionHolder.getActiveSession()
                         try {
-                            activeSession.updateAvatar(
+                            activeSession.profileService().updateAvatar(
                                     activeSession.myUserId,
                                     pictureUri,
                                     uriFilenameResolver.getFilenameFromUri(pictureUri) ?: UUID.randomUUID().toString()
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthAccountCreatedFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthAccountCreatedFragment.kt
index 49db52da67..b8114b5d94 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthAccountCreatedFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthAccountCreatedFragment.kt
@@ -24,6 +24,7 @@ import androidx.core.view.isVisible
 import im.vector.app.R
 import im.vector.app.core.animations.play
 import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.utils.isAnimationEnabled
 import im.vector.app.databinding.FragmentFtueAccountCreatedBinding
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingViewEvents
@@ -57,7 +58,7 @@ class FtueAuthAccountCreatedFragment @Inject constructor(
         views.personalizeButtonGroup.isVisible = canPersonalize
         views.takeMeHomeButtonGroup.isVisible = !canPersonalize
 
-        if (!hasPlayedConfetti && !canPersonalize) {
+        if (!hasPlayedConfetti && !canPersonalize && requireContext().isAnimationEnabled()) {
             hasPlayedConfetti = true
             views.viewKonfetti.isVisible = true
             views.viewKonfetti.play()
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthChooseProfilePictureFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthChooseProfilePictureFragment.kt
index 81300932db..0ccff7dffc 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthChooseProfilePictureFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthChooseProfilePictureFragment.kt
@@ -29,6 +29,7 @@ import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.dialogs.GalleryOrCameraDialogHelper
 import im.vector.app.core.extensions.singletonEntryPoint
 import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.time.Clock
 import im.vector.app.databinding.FragmentFtueProfilePictureBinding
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.onboarding.OnboardingAction
@@ -39,10 +40,11 @@ import javax.inject.Inject
 
 class FtueAuthChooseProfilePictureFragment @Inject constructor(
         private val activeSessionHolder: ActiveSessionHolder,
-        colorProvider: ColorProvider
+        colorProvider: ColorProvider,
+        clock: Clock,
 ) : AbstractFtueAuthFragment<FragmentFtueProfilePictureBinding>(), GalleryOrCameraDialogHelper.Listener {
 
-    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider)
+    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider, clock)
     private val avatarRenderer: AvatarRenderer by lazy { requireContext().singletonEntryPoint().avatarRenderer() }
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueProfilePictureBinding {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
index 4888b43946..696ebb4786 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt
@@ -127,11 +127,13 @@ class FtueAuthLoginFragment @Inject constructor() : AbstractSSOFtueAuthFragment<
         // This can be called by the IME action, so deal with empty cases
         var error = 0
         if (login.isEmpty()) {
-            views.loginFieldTil.error = getString(if (isSignupMode) {
-                R.string.error_empty_field_choose_user_name
-            } else {
-                R.string.error_empty_field_enter_user_name
-            })
+            views.loginFieldTil.error = getString(
+                    if (isSignupMode) {
+                        R.string.error_empty_field_choose_user_name
+                    } else {
+                        R.string.error_empty_field_enter_user_name
+                    }
+            )
             error++
         }
         if (isSignupMode && isNumericOnlyUserIdForbidden && login.isDigitsOnly()) {
@@ -139,11 +141,13 @@ class FtueAuthLoginFragment @Inject constructor() : AbstractSSOFtueAuthFragment<
             error++
         }
         if (password.isEmpty()) {
-            views.passwordFieldTil.error = getString(if (isSignupMode) {
-                R.string.error_empty_field_choose_password
-            } else {
-                R.string.error_empty_field_your_password
-            })
+            views.passwordFieldTil.error = getString(
+                    if (isSignupMode) {
+                        R.string.error_empty_field_choose_password
+                    } else {
+                        R.string.error_empty_field_your_password
+                    }
+            )
             error++
         }
 
@@ -159,12 +163,14 @@ class FtueAuthLoginFragment @Inject constructor() : AbstractSSOFtueAuthFragment<
     }
 
     private fun setupUi(state: OnboardingViewState) {
-        views.loginFieldTil.hint = getString(when (state.signMode) {
-            SignMode.Unknown            -> error("developer error")
-            SignMode.SignUp             -> R.string.login_signup_username_hint
-            SignMode.SignIn             -> R.string.login_signin_username_hint
-            SignMode.SignInWithMatrixId -> R.string.login_signin_matrix_id_hint
-        })
+        views.loginFieldTil.hint = getString(
+                when (state.signMode) {
+                    SignMode.Unknown            -> error("developer error")
+                    SignMode.SignUp             -> R.string.login_signup_username_hint
+                    SignMode.SignIn             -> R.string.login_signin_username_hint
+                    SignMode.SignInWithMatrixId -> R.string.login_signin_matrix_id_hint
+                }
+        )
 
         // Handle direct signin first
         if (state.signMode == SignMode.SignInWithMatrixId) {
@@ -225,12 +231,14 @@ class FtueAuthLoginFragment @Inject constructor() : AbstractSSOFtueAuthFragment<
     private fun setupButtons(state: OnboardingViewState) {
         views.forgetPasswordButton.isVisible = state.signMode == SignMode.SignIn
 
-        views.loginSubmit.text = getString(when (state.signMode) {
-            SignMode.Unknown            -> error("developer error")
-            SignMode.SignUp             -> R.string.login_signup_submit
-            SignMode.SignIn,
-            SignMode.SignInWithMatrixId -> R.string.login_signin
-        })
+        views.loginSubmit.text = getString(
+                when (state.signMode) {
+                    SignMode.Unknown            -> error("developer error")
+                    SignMode.SignUp             -> R.string.login_signup_submit
+                    SignMode.SignIn,
+                    SignMode.SignInWithMatrixId -> R.string.login_signin
+                }
+        )
     }
 
     private fun setupSubmitButton() {
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthPersonalizationCompleteFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthPersonalizationCompleteFragment.kt
index 6b47b9830c..074f58864e 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthPersonalizationCompleteFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthPersonalizationCompleteFragment.kt
@@ -22,6 +22,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
 import im.vector.app.core.animations.play
+import im.vector.app.core.utils.isAnimationEnabled
 import im.vector.app.databinding.FragmentFtuePersonalizationCompleteBinding
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingViewEvents
@@ -43,7 +44,7 @@ class FtueAuthPersonalizationCompleteFragment @Inject constructor() : AbstractFt
     private fun setupViews() {
         views.personalizationCompleteCta.debouncedClicks { viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.OnTakeMeHome)) }
 
-        if (!hasPlayedConfetti) {
+        if (!hasPlayedConfetti && requireContext().isAnimationEnabled()) {
             hasPlayedConfetti = true
             views.viewKonfetti.isVisible = true
             views.viewKonfetti.play()
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt
index df304d028d..c542f80712 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt
@@ -104,11 +104,13 @@ class FtueAuthServerUrlFormFragment @Inject constructor() : AbstractFtueAuthFrag
             }
         }
         val completions = state.knownCustomHomeServersUrls + if (BuildConfig.DEBUG) listOf("http://10.0.2.2:8080") else emptyList()
-        views.loginServerUrlFormHomeServerUrl.setAdapter(ArrayAdapter(
-                requireContext(),
-                R.layout.item_completion_homeserver,
-                completions
-        ))
+        views.loginServerUrlFormHomeServerUrl.setAdapter(
+                ArrayAdapter(
+                        requireContext(),
+                        R.layout.item_completion_homeserver,
+                        completions
+                )
+        )
         views.loginServerUrlFormHomeServerUrlTil.endIconMode = TextInputLayout.END_ICON_DROPDOWN_MENU
                 .takeIf { completions.isNotEmpty() }
                 ?: TextInputLayout.END_ICON_NONE
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
index d5816762df..2fe9a82fbd 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
@@ -45,7 +45,6 @@ import im.vector.app.features.login.ServerType
 import im.vector.app.features.login.SignMode
 import im.vector.app.features.login.TextInputFormFragmentMode
 import im.vector.app.features.login.isSupported
-import im.vector.app.features.login.terms.toLocalizedLoginTerms
 import im.vector.app.features.onboarding.OnboardingAction
 import im.vector.app.features.onboarding.OnboardingActivity
 import im.vector.app.features.onboarding.OnboardingVariant
@@ -57,6 +56,7 @@ import im.vector.app.features.onboarding.ftueauth.terms.FtueAuthTermsFragment
 import im.vector.app.features.onboarding.ftueauth.terms.FtueAuthTermsLegacyStyleFragmentArgument
 import org.matrix.android.sdk.api.auth.registration.FlowResult
 import org.matrix.android.sdk.api.auth.registration.Stage
+import org.matrix.android.sdk.api.auth.toLocalizedLoginTerms
 import org.matrix.android.sdk.api.extensions.tryOrNull
 
 private const val FRAGMENT_REGISTRATION_STAGE_TAG = "FRAGMENT_REGISTRATION_STAGE_TAG"
@@ -131,24 +131,7 @@ class FtueAuthVariant(
     private fun handleOnboardingViewEvents(viewEvents: OnboardingViewEvents) {
         when (viewEvents) {
             is OnboardingViewEvents.RegistrationFlowResult                     -> {
-                if (registrationShouldFallback(viewEvents)) {
-                    // Display a popup to propose use web fallback
-                    onRegistrationStageNotSupported()
-                } else {
-                    if (viewEvents.isRegistrationStarted) {
-                        // Go on with registration flow
-                        handleRegistrationNavigation(viewEvents.flowResult)
-                    } else {
-                        if (vectorFeatures.isOnboardingCombinedRegisterEnabled()) {
-                            openCombinedRegister()
-                        } else {
-                            // First ask for login and password
-                            // I add a tag to indicate that this fragment is a registration stage.
-                            // This way it will be automatically popped in when starting the next registration stage
-                            openAuthLoginFragmentWithTag(FRAGMENT_REGISTRATION_STAGE_TAG)
-                        }
-                    }
-                }
+                onRegistrationFlow(viewEvents)
             }
             is OnboardingViewEvents.OutdatedHomeserver                         -> {
                 MaterialAlertDialogBuilder(activity)
@@ -176,25 +159,33 @@ class FtueAuthVariant(
             is OnboardingViewEvents.OnServerSelectionDone                      -> onServerSelectionDone(viewEvents)
             is OnboardingViewEvents.OnSignModeSelected                         -> onSignModeSelected(viewEvents)
             is OnboardingViewEvents.OnLoginFlowRetrieved                       ->
-                activity.addFragmentToBackstack(views.loginFragmentContainer,
+                activity.addFragmentToBackstack(
+                        views.loginFragmentContainer,
                         FtueAuthSignUpSignInSelectionFragment::class.java,
-                        option = commonOption)
+                        option = commonOption
+                )
             is OnboardingViewEvents.OnWebLoginError                            -> onWebLoginError(viewEvents)
             is OnboardingViewEvents.OnForgetPasswordClicked                    ->
-                activity.addFragmentToBackstack(views.loginFragmentContainer,
+                activity.addFragmentToBackstack(
+                        views.loginFragmentContainer,
                         FtueAuthResetPasswordFragment::class.java,
-                        option = commonOption)
+                        option = commonOption
+                )
             is OnboardingViewEvents.OnResetPasswordSendThreePidDone            -> {
                 supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
-                activity.addFragmentToBackstack(views.loginFragmentContainer,
+                activity.addFragmentToBackstack(
+                        views.loginFragmentContainer,
                         FtueAuthResetPasswordMailConfirmationFragment::class.java,
-                        option = commonOption)
+                        option = commonOption
+                )
             }
             is OnboardingViewEvents.OnResetPasswordMailConfirmationSuccess     -> {
                 supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
-                activity.addFragmentToBackstack(views.loginFragmentContainer,
+                activity.addFragmentToBackstack(
+                        views.loginFragmentContainer,
                         FtueAuthResetPasswordSuccessFragment::class.java,
-                        option = commonOption)
+                        option = commonOption
+                )
             }
             is OnboardingViewEvents.OnResetPasswordMailConfirmationSuccessDone -> {
                 // Go back to the login fragment
@@ -221,11 +212,13 @@ class FtueAuthVariant(
                 // This is handled by the Fragments
                 Unit
             OnboardingViewEvents.OpenUseCaseSelection                          -> {
-                activity.addFragmentToBackstack(views.loginFragmentContainer,
+                activity.addFragmentToBackstack(
+                        views.loginFragmentContainer,
                         FtueAuthUseCaseFragment::class.java,
-                        option = commonOption)
+                        option = commonOption
+                )
             }
-            OnboardingViewEvents.OpenCombinedRegister                          -> openCombinedRegister()
+            OnboardingViewEvents.OpenCombinedRegister                          -> openStartCombinedRegister()
             is OnboardingViewEvents.OnAccountCreated                           -> onAccountCreated()
             OnboardingViewEvents.OnAccountSignedIn                             -> onAccountSignedIn()
             OnboardingViewEvents.OnChooseDisplayName                           -> onChooseDisplayName()
@@ -244,7 +237,21 @@ class FtueAuthVariant(
         }
     }
 
-    private fun openCombinedRegister() {
+    private fun onRegistrationFlow(viewEvents: OnboardingViewEvents.RegistrationFlowResult) {
+        when {
+            registrationShouldFallback(viewEvents)               -> displayFallbackWebDialog()
+            viewEvents.isRegistrationStarted                     -> handleRegistrationNavigation(viewEvents.flowResult.orderedStages())
+            vectorFeatures.isOnboardingCombinedRegisterEnabled() -> openStartCombinedRegister()
+            else                                                 -> openAuthLoginFragmentWithTag(FRAGMENT_REGISTRATION_STAGE_TAG)
+        }
+    }
+
+    private fun FlowResult.orderedStages() = when {
+        vectorFeatures.isOnboardingCombinedRegisterEnabled() -> missingStages.sortedWith(FtueMissingRegistrationStagesComparator())
+        else                                                 -> missingStages
+    }
+
+    private fun openStartCombinedRegister() {
         addRegistrationStageFragmentToBackstack(FtueAuthCombinedRegisterFragment::class.java)
     }
 
@@ -254,14 +261,16 @@ class FtueAuthVariant(
     private fun OnboardingViewEvents.RegistrationFlowResult.containsUnsupportedRegistrationFlow() =
             flowResult.missingStages.any { !it.isSupported() }
 
-    private fun onRegistrationStageNotSupported() {
+    private fun displayFallbackWebDialog() {
         MaterialAlertDialogBuilder(activity)
                 .setTitle(R.string.app_name)
                 .setMessage(activity.getString(R.string.login_registration_not_supported))
                 .setPositiveButton(R.string.yes) { _, _ ->
-                    activity.addFragmentToBackstack(views.loginFragmentContainer,
+                    activity.addFragmentToBackstack(
+                            views.loginFragmentContainer,
                             FtueAuthWebFragment::class.java,
-                            option = commonOption)
+                            option = commonOption
+                    )
                 }
                 .setNegativeButton(R.string.no, null)
                 .show()
@@ -283,9 +292,11 @@ class FtueAuthVariant(
         when (OnboardingViewEvents.serverType) {
             ServerType.MatrixOrg -> Unit // In this case, we wait for the login flow
             ServerType.EMS,
-            ServerType.Other     -> activity.addFragmentToBackstack(views.loginFragmentContainer,
+            ServerType.Other     -> activity.addFragmentToBackstack(
+                    views.loginFragmentContainer,
                     FtueAuthServerUrlFormFragment::class.java,
-                    option = commonOption)
+                    option = commonOption
+            )
             ServerType.Unknown   -> Unit /* Should not happen */
         }
     }
@@ -317,10 +328,12 @@ class FtueAuthVariant(
     }
 
     private fun openAuthLoginFragmentWithTag(tag: String) {
-        activity.addFragmentToBackstack(views.loginFragmentContainer,
+        activity.addFragmentToBackstack(
+                views.loginFragmentContainer,
                 FtueAuthLoginFragment::class.java,
                 tag = tag,
-                option = commonOption)
+                option = commonOption
+        )
     }
 
     private fun onLoginModeNotSupported(supportedTypes: List<String>) {
@@ -341,9 +354,11 @@ class FtueAuthVariant(
     }
 
     private fun openAuthWebFragment() {
-        activity.addFragmentToBackstack(views.loginFragmentContainer,
+        activity.addFragmentToBackstack(
+                views.loginFragmentContainer,
                 FtueAuthWebFragment::class.java,
-                option = commonOption)
+                option = commonOption
+        )
     }
 
     /**
@@ -355,15 +370,15 @@ class FtueAuthVariant(
                 ?.let { onboardingViewModel.handle(OnboardingAction.LoginWithToken(it)) }
     }
 
-    private fun handleRegistrationNavigation(flowResult: FlowResult) {
+    private fun handleRegistrationNavigation(remainingStages: List<Stage>) {
         // Complete all mandatory stages first
-        val mandatoryStage = flowResult.missingStages.firstOrNull { it.mandatory }
+        val mandatoryStage = remainingStages.firstOrNull { it.mandatory }
 
         if (mandatoryStage != null) {
             doStage(mandatoryStage)
         } else {
             // Consider optional stages
-            val optionalStage = flowResult.missingStages.firstOrNull { !it.mandatory && it !is Stage.Dummy }
+            val optionalStage = remainingStages.firstOrNull { !it.mandatory && it !is Stage.Dummy }
             if (optionalStage == null) {
                 // Should not happen...
             } else {
@@ -437,14 +452,16 @@ class FtueAuthVariant(
     }
 
     private fun onChooseDisplayName() {
-        activity.addFragmentToBackstack(views.loginFragmentContainer,
+        activity.addFragmentToBackstack(
+                views.loginFragmentContainer,
                 FtueAuthChooseDisplayNameFragment::class.java,
                 option = commonOption
         )
     }
 
     private fun onChooseProfilePicture() {
-        activity.addFragmentToBackstack(views.loginFragmentContainer,
+        activity.addFragmentToBackstack(
+                views.loginFragmentContainer,
                 FtueAuthChooseProfilePictureFragment::class.java,
                 option = commonOption
         )
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueMissingRegistrationStagesComparator.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueMissingRegistrationStagesComparator.kt
new file mode 100644
index 0000000000..6a6326625e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueMissingRegistrationStagesComparator.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.onboarding.ftueauth
+
+import org.matrix.android.sdk.api.auth.registration.Stage
+
+class FtueMissingRegistrationStagesComparator : Comparator<Stage> {
+
+    override fun compare(a: Stage?, b: Stage?): Int {
+        return (a?.toPriority() ?: 0) - (b?.toPriority() ?: 0)
+    }
+
+    private fun Stage.toPriority() = when (this) {
+        is Stage.Email     -> 0
+        is Stage.Msisdn    -> 1
+        is Stage.Terms     -> 2
+        is Stage.ReCaptcha -> 3
+        is Stage.Other     -> 4
+        is Stage.Dummy     -> 5
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/SplashCarouselStateFactory.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/SplashCarouselStateFactory.kt
index 006492f6dc..23f7014374 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/SplashCarouselStateFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/SplashCarouselStateFactory.kt
@@ -41,32 +41,34 @@ class SplashCarouselStateFactory @Inject constructor(
         val lightTheme = themeProvider.isLightTheme()
         fun background(@DrawableRes lightDrawable: Int) = if (lightTheme) lightDrawable else R.drawable.bg_carousel_page_dark
         fun hero(@DrawableRes lightDrawable: Int, @DrawableRes darkDrawable: Int) = if (lightTheme) lightDrawable else darkDrawable
-        return SplashCarouselState(listOf(
-                SplashCarouselState.Item(
-                        R.string.ftue_auth_carousel_secure_title.colorTerminatingFullStop(R.attr.colorAccent),
-                        R.string.ftue_auth_carousel_secure_body,
-                        hero(R.drawable.ic_splash_conversations, R.drawable.ic_splash_conversations_dark),
-                        background(R.drawable.bg_carousel_page_1)
-                ),
-                SplashCarouselState.Item(
-                        R.string.ftue_auth_carousel_control_title.colorTerminatingFullStop(R.attr.colorAccent),
-                        R.string.ftue_auth_carousel_control_body,
-                        hero(R.drawable.ic_splash_control, R.drawable.ic_splash_control_dark),
-                        background(R.drawable.bg_carousel_page_2)
-                ),
-                SplashCarouselState.Item(
-                        R.string.ftue_auth_carousel_encrypted_title.colorTerminatingFullStop(R.attr.colorAccent),
-                        R.string.ftue_auth_carousel_encrypted_body,
-                        hero(R.drawable.ic_splash_secure, R.drawable.ic_splash_secure_dark),
-                        background(R.drawable.bg_carousel_page_3)
-                ),
-                SplashCarouselState.Item(
-                        collaborationTitle().colorTerminatingFullStop(R.attr.colorAccent),
-                        R.string.ftue_auth_carousel_workplace_body,
-                        hero(R.drawable.ic_splash_collaboration, R.drawable.ic_splash_collaboration_dark),
-                        background(R.drawable.bg_carousel_page_4)
+        return SplashCarouselState(
+                listOf(
+                        SplashCarouselState.Item(
+                                R.string.ftue_auth_carousel_secure_title.colorTerminatingFullStop(R.attr.colorAccent),
+                                R.string.ftue_auth_carousel_secure_body,
+                                hero(R.drawable.ic_splash_conversations, R.drawable.ic_splash_conversations_dark),
+                                background(R.drawable.bg_carousel_page_1)
+                        ),
+                        SplashCarouselState.Item(
+                                R.string.ftue_auth_carousel_control_title.colorTerminatingFullStop(R.attr.colorAccent),
+                                R.string.ftue_auth_carousel_control_body,
+                                hero(R.drawable.ic_splash_control, R.drawable.ic_splash_control_dark),
+                                background(R.drawable.bg_carousel_page_2)
+                        ),
+                        SplashCarouselState.Item(
+                                R.string.ftue_auth_carousel_encrypted_title.colorTerminatingFullStop(R.attr.colorAccent),
+                                R.string.ftue_auth_carousel_encrypted_body,
+                                hero(R.drawable.ic_splash_secure, R.drawable.ic_splash_secure_dark),
+                                background(R.drawable.bg_carousel_page_3)
+                        ),
+                        SplashCarouselState.Item(
+                                collaborationTitle().colorTerminatingFullStop(R.attr.colorAccent),
+                                R.string.ftue_auth_carousel_workplace_body,
+                                hero(R.drawable.ic_splash_collaboration, R.drawable.ic_splash_collaboration_dark),
+                                background(R.drawable.bg_carousel_page_4)
+                        )
                 )
-        ))
+        )
     }
 
     private fun collaborationTitle(): Int {
diff --git a/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
index f840e9ea6f..74b696510f 100644
--- a/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
@@ -25,6 +25,7 @@ import im.vector.app.core.extensions.isIgnored
 import im.vector.app.core.resources.UserPreferencesProvider
 import im.vector.app.core.utils.toast
 import im.vector.app.features.home.room.threads.arguments.ThreadTimelineArgs
+import im.vector.app.features.matrixto.OriginOfMatrixTo
 import im.vector.app.features.navigation.Navigator
 import im.vector.app.features.roomdirectory.roompreview.RoomPreviewData
 import kotlinx.coroutines.Dispatchers
@@ -32,9 +33,12 @@ import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.events.model.getRootThreadEventId
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.permalinks.PermalinkData
 import org.matrix.android.sdk.api.session.permalinks.PermalinkParser
 import org.matrix.android.sdk.api.session.permalinks.PermalinkService
+import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.RoomType
@@ -145,7 +149,7 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
     private suspend fun PermalinkData.RoomLink.getRoomId(): String? {
         val session = activeSessionHolder.getSafeActiveSession()
         return if (isRoomAlias && session != null) {
-            val roomIdByAlias = session.getRoomIdByAlias(roomIdOrAlias, true)
+            val roomIdByAlias = session.roomService().getRoomIdByAlias(roomIdOrAlias, true)
             roomIdByAlias.getOrNull()?.roomId
         } else {
             roomIdOrAlias
@@ -190,12 +194,12 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
                     navigationInterceptor.openJoinedRoomScreen(buildTask, roomId, eventId, rawLink, context, rootThreadEventId, roomSummary)
                 } else {
                     // maybe open space preview navigator.openSpacePreview(context, roomId)? if already joined?
-                    navigator.openMatrixToBottomSheet(context, rawLink.toString())
+                    navigator.openMatrixToBottomSheet(context, rawLink.toString(), OriginOfMatrixTo.LINK)
                 }
             }
             else                             -> {
                 // XXX this could trigger another server load
-                navigator.openMatrixToBottomSheet(context, rawLink.toString())
+                navigator.openMatrixToBottomSheet(context, rawLink.toString(), OriginOfMatrixTo.LINK)
             }
         }
     }
@@ -215,7 +219,8 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
                         displayName = roomSummary.displayName,
                         avatarUrl = roomSummary.avatarUrl,
                         roomEncryptionTrustLevel = roomSummary.roomEncryptionTrustLevel,
-                        rootThreadEventId = rootThreadEventId)
+                        rootThreadEventId = rootThreadEventId
+                )
                 navigator.openThread(context, threadTimelineArgs, eventId)
             } else {
                 navigator.openRoom(context, roomId, eventId, buildTask)
diff --git a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewModel.kt b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewModel.kt
index 835f6d670e..8bbbea6443 100644
--- a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewModel.kt
@@ -25,6 +25,8 @@ import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.poll.PollMode
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.api.session.room.model.message.MessagePollContent
 import org.matrix.android.sdk.api.session.room.model.message.PollType
 import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
@@ -108,7 +110,7 @@ class CreatePollViewModel @AssistedInject constructor(
             }
             else                                     -> {
                 when (state.mode) {
-                    PollMode.CREATE -> room.sendPoll(state.pollType, state.question, nonEmptyOptions)
+                    PollMode.CREATE -> room.sendService().sendPoll(state.pollType, state.question, nonEmptyOptions)
                     PollMode.EDIT   -> sendEditedPoll(state.editedEventId!!, state.pollType, state.question, nonEmptyOptions)
                 }
                 _viewEvents.post(CreatePollViewEvents.Success)
@@ -118,7 +120,7 @@ class CreatePollViewModel @AssistedInject constructor(
 
     private fun sendEditedPoll(editedEventId: String, pollType: PollType, question: String, options: List<String>) {
         val editedEvent = room.getTimelineEvent(editedEventId) ?: return
-        room.editPoll(editedEvent, pollType, question, options)
+        room.relationService().editPoll(editedEvent, pollType, question, options)
     }
 
     private fun handleOnAddOption() {
diff --git a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewState.kt b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewState.kt
index 3fd8ab605c..cfa1ff847e 100644
--- a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewState.kt
@@ -21,14 +21,14 @@ import im.vector.app.features.poll.PollMode
 import org.matrix.android.sdk.api.session.room.model.message.PollType
 
 data class CreatePollViewState(
-    val roomId: String,
-    val editedEventId: String?,
-    val mode: PollMode,
-    val question: String = "",
-    val options: List<String> = List(CreatePollViewModel.MIN_OPTIONS_COUNT) { "" },
-    val canCreatePoll: Boolean = false,
-    val canAddMoreOptions: Boolean = true,
-    val pollType: PollType = PollType.DISCLOSED_UNSTABLE
+        val roomId: String,
+        val editedEventId: String?,
+        val mode: PollMode,
+        val question: String = "",
+        val options: List<String> = List(CreatePollViewModel.MIN_OPTIONS_COUNT) { "" },
+        val canCreatePoll: Boolean = false,
+        val canAddMoreOptions: Boolean = true,
+        val pollType: PollType = PollType.DISCLOSED_UNSTABLE
 ) : MavericksState {
 
     constructor(args: CreatePollArgs) : this(
diff --git a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
index ae03b5345a..5d16fabbfd 100644
--- a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
@@ -24,7 +24,8 @@ import android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS
 import com.tapadoo.alerter.Alerter
 import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseActivity
-import im.vector.app.core.utils.isAnimationDisabled
+import im.vector.app.core.time.Clock
+import im.vector.app.core.utils.isAnimationEnabled
 import im.vector.app.features.analytics.ui.consent.AnalyticsOptInActivity
 import im.vector.app.features.pin.PinActivity
 import im.vector.app.features.signout.hard.SignedOutActivity
@@ -41,7 +42,9 @@ import javax.inject.Singleton
  * will be back in the queue in first position.
  */
 @Singleton
-class PopupAlertManager @Inject constructor() {
+class PopupAlertManager @Inject constructor(
+        private val clock: Clock,
+) {
 
     companion object {
         const val INCOMING_CALL_PRIORITY = Int.MAX_VALUE
@@ -116,7 +119,7 @@ class PopupAlertManager @Inject constructor() {
             return
         }
         if (currentAlerter != null) {
-            if (currentAlerter!!.expirationTimestamp != null && System.currentTimeMillis() > currentAlerter!!.expirationTimestamp!!) {
+            if (currentAlerter!!.expirationTimestamp != null && clock.epochMillis() > currentAlerter!!.expirationTimestamp!!) {
                 // this alert has expired, remove it
                 // perform dismiss
                 try {
@@ -162,7 +165,7 @@ class PopupAlertManager @Inject constructor() {
         currentAlerter = next
         next?.let {
             if (!shouldBeDisplayedIn(next, currentActivity)) return
-            val currentTime = System.currentTimeMillis()
+            val currentTime = clock.epochMillis()
             if (next.expirationTimestamp != null && currentTime > next.expirationTimestamp!!) {
                 // skip
                 try {
@@ -215,7 +218,7 @@ class PopupAlertManager @Inject constructor() {
         if (!alert.isLight) {
             clearLightStatusBar()
         }
-        val noAnimation = !animate || isAnimationDisabled(activity)
+        val noAnimation = !(animate && activity.isAnimationEnabled())
 
         alert.weakCurrentActivity = WeakReference(activity)
         val alerter = Alerter.create(activity, alert.layoutRes)
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
index 701d04f3c9..350dd13b22 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
@@ -63,11 +63,11 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
 
         // Default screen is for bug report, so modify it for suggestion
         when (reportType) {
-            ReportType.BUG_REPORT          -> {
+            ReportType.BUG_REPORT            -> {
                 supportActionBar?.setTitle(R.string.title_activity_bug_report)
                 views.bugReportButtonContactMe.isVisible = true
             }
-            ReportType.SUGGESTION          -> {
+            ReportType.SUGGESTION            -> {
                 supportActionBar?.setTitle(R.string.send_suggestion)
 
                 views.bugReportFirstText.setText(R.string.send_suggestion_content)
@@ -76,7 +76,7 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
 
                 hideBugReportOptions()
             }
-            ReportType.SPACE_BETA_FEEDBACK -> {
+            ReportType.SPACE_BETA_FEEDBACK   -> {
                 supportActionBar?.setTitle(R.string.send_feedback_space_title)
 
                 views.bugReportFirstText.setText(R.string.send_feedback_space_info)
@@ -94,7 +94,7 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
 
                 hideBugReportOptions()
             }
-            else                           -> {
+            else                             -> {
                 // other types not supported here
             }
         }
@@ -176,16 +176,22 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
                             if (!reason.isNullOrEmpty()) {
                                 when (reportType) {
                                     ReportType.BUG_REPORT          -> {
-                                        Toast.makeText(this@BugReportActivity,
-                                                getString(R.string.send_bug_report_failed, reason), Toast.LENGTH_LONG).show()
+                                        Toast.makeText(
+                                                this@BugReportActivity,
+                                                getString(R.string.send_bug_report_failed, reason), Toast.LENGTH_LONG
+                                        ).show()
                                     }
                                     ReportType.SUGGESTION          -> {
-                                        Toast.makeText(this@BugReportActivity,
-                                                getString(R.string.send_suggestion_failed, reason), Toast.LENGTH_LONG).show()
+                                        Toast.makeText(
+                                                this@BugReportActivity,
+                                                getString(R.string.send_suggestion_failed, reason), Toast.LENGTH_LONG
+                                        ).show()
                                     }
                                     ReportType.SPACE_BETA_FEEDBACK -> {
-                                        Toast.makeText(this@BugReportActivity,
-                                                getString(R.string.feedback_failed, reason), Toast.LENGTH_LONG).show()
+                                        Toast.makeText(
+                                                this@BugReportActivity,
+                                                getString(R.string.feedback_failed, reason), Toast.LENGTH_LONG
+                                        ).show()
                                     }
                                     else                           -> {
                                         // nop
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReportViewModel.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReportViewModel.kt
index d0a1280868..6437f5c8f8 100644
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReportViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReportViewModel.kt
@@ -39,7 +39,7 @@ class BugReportViewModel @AssistedInject constructor(
         override fun create(initialState: BugReportState): BugReportViewModel
     }
 
-    companion object : MavericksViewModelFactory<BugReportViewModel, BugReportState>  by hiltMavericksViewModelFactory()
+    companion object : MavericksViewModelFactory<BugReportViewModel, BugReportState> by hiltMavericksViewModelFactory()
 
     init {
         fetchHomeserverVersion()
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
index 8b514f4003..f723a281a0 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
@@ -111,7 +111,8 @@ class BugReporter @Inject constructor(
 
     private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
 
-    private val LOGCAT_CMD_ERROR = arrayOf("logcat", // /< Run 'logcat' command
+    private val LOGCAT_CMD_ERROR = arrayOf(
+            "logcat", // /< Run 'logcat' command
             "-d", // /< Dump the log rather than continue outputting it
             "-v", // formatting
             "threadtime", // include timestamps
@@ -278,8 +279,10 @@ class BugReporter @Inject constructor(
                             .addFormDataPart("device", Build.MODEL.trim())
                             .addFormDataPart("verbose_log", vectorPreferences.labAllowedExtendedLogging().toOnOff())
                             .addFormDataPart("multi_window", inMultiWindowMode.toOnOff())
-                            .addFormDataPart("os", Build.VERSION.RELEASE + " (API " + Build.VERSION.SDK_INT + ") " +
-                                    Build.VERSION.INCREMENTAL + "-" + Build.VERSION.CODENAME)
+                            .addFormDataPart(
+                                    "os", Build.VERSION.RELEASE + " (API " + Build.VERSION.SDK_INT + ") " +
+                                    Build.VERSION.INCREMENTAL + "-" + Build.VERSION.CODENAME
+                            )
                             .addFormDataPart("locale", Locale.getDefault().toString())
                             .addFormDataPart("app_language", VectorLocale.applicationLocale.toString())
                             .addFormDataPart("default_app_language", systemLocaleProvider.getSystemLocale().toString())
@@ -317,8 +320,10 @@ class BugReporter @Inject constructor(
                                     bitmap.compress(Bitmap.CompressFormat.PNG, 100, it)
                                 }
 
-                                builder.addFormDataPart("file",
-                                        logCatScreenshotFile.name, logCatScreenshotFile.asRequestBody(MimeTypes.OctetStream.toMediaTypeOrNull()))
+                                builder.addFormDataPart(
+                                        "file",
+                                        logCatScreenshotFile.name, logCatScreenshotFile.asRequestBody(MimeTypes.OctetStream.toMediaTypeOrNull())
+                                )
                             } catch (e: Exception) {
                                 Timber.e(e, "## sendBugReport() : fail to write screenshot$e")
                             }
@@ -494,11 +499,13 @@ class BugReporter @Inject constructor(
         // app: Identifier for the application (eg 'riot-web').
         // Should correspond to a mapping configured in the configuration file for github issue reporting to work.
         // (see R.string.bug_report_url for configured RS server)
-        return context.getString(when (reportType) {
-            ReportType.AUTO_UISI_SENDER,
-            ReportType.AUTO_UISI -> R.string.bug_report_auto_uisi_app_name
-            else                 -> R.string.bug_report_app_name
-        })
+        return context.getString(
+                when (reportType) {
+                    ReportType.AUTO_UISI_SENDER,
+                    ReportType.AUTO_UISI -> R.string.bug_report_auto_uisi_app_name
+                    else                 -> R.string.bug_report_app_name
+                }
+        )
     }
 // ==============================================================================================================
 // crash report management
diff --git a/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultViewModel.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultViewModel.kt
index e1e52fdca1..720061e326 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultViewModel.kt
@@ -36,7 +36,7 @@ data class EmojiSearchResultViewState(
 class EmojiSearchResultViewModel @AssistedInject constructor(
         @Assisted initialState: EmojiSearchResultViewState,
         private val dataSource: EmojiDataSource) :
-    VectorViewModel<EmojiSearchResultViewState, EmojiSearchAction, EmptyViewEvents>(initialState) {
+        VectorViewModel<EmojiSearchResultViewState, EmojiSearchAction, EmptyViewEvents>(initialState) {
 
     @AssistedFactory
     interface Factory : MavericksAssistedViewModelFactory<EmojiSearchResultViewModel, EmojiSearchResultViewState> {
diff --git a/vector/src/main/java/im/vector/app/features/reactions/widget/DotsView.kt b/vector/src/main/java/im/vector/app/features/reactions/widget/DotsView.kt
index c9283c663a..7b0052db0b 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/widget/DotsView.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/widget/DotsView.kt
@@ -126,10 +126,12 @@ class DotsView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
             this.currentDotSize2 = maxDotSize
         } else if (currentProgress < 0.5) {
             this.currentDotSize2 = CircleView.mapValueFromRangeToRange(
-                    currentProgress, 0.2f, 0.5f, maxDotSize, 0.3f * maxDotSize)
+                    currentProgress, 0.2f, 0.5f, maxDotSize, 0.3f * maxDotSize
+            )
         } else {
             this.currentDotSize2 = CircleView.mapValueFromRangeToRange(
-                    currentProgress, 0.5f, 1f, maxDotSize * 0.3f, 0f)
+                    currentProgress, 0.5f, 1f, maxDotSize * 0.3f, 0f
+            )
         }
     }
 
@@ -143,17 +145,20 @@ class DotsView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
     private fun updateOuterDotsPosition() {
         if (currentProgress < 0.3f) {
             this.currentRadius1 = CircleView.mapValueFromRangeToRange(
-                    currentProgress, 0.0f, 0.3f, 0f, maxOuterDotsRadius * 0.8f)
+                    currentProgress, 0.0f, 0.3f, 0f, maxOuterDotsRadius * 0.8f
+            )
         } else {
             this.currentRadius1 = CircleView.mapValueFromRangeToRange(
-                    currentProgress, 0.3f, 1f, 0.8f * maxOuterDotsRadius, maxOuterDotsRadius)
+                    currentProgress, 0.3f, 1f, 0.8f * maxOuterDotsRadius, maxOuterDotsRadius
+            )
         }
 
         if (currentProgress < 0.7) {
             this.currentDotSize1 = maxDotSize
         } else {
             this.currentDotSize1 = CircleView.mapValueFromRangeToRange(
-                    currentProgress, 0.7f, 1f, maxDotSize, 0f)
+                    currentProgress, 0.7f, 1f, maxDotSize, 0f
+            )
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt
index 0cb49746f1..663bb1b372 100644
--- a/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt
@@ -36,7 +36,9 @@ import kotlinx.coroutines.flow.onEach
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.getStateEvent
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.util.Optional
@@ -50,7 +52,7 @@ class RequireActiveMembershipViewModel @AssistedInject constructor(
         @Assisted initialState: RequireActiveMembershipViewState,
         private val stringProvider: StringProvider,
         private val session: Session) :
-    VectorViewModel<RequireActiveMembershipViewState, RequireActiveMembershipAction, RequireActiveMembershipViewEvents>(initialState) {
+        VectorViewModel<RequireActiveMembershipViewState, RequireActiveMembershipAction, RequireActiveMembershipViewEvents>(initialState) {
 
     @AssistedFactory
     interface Factory : MavericksAssistedViewModelFactory<RequireActiveMembershipViewModel, RequireActiveMembershipViewState> {
@@ -92,7 +94,7 @@ class RequireActiveMembershipViewModel @AssistedInject constructor(
         }
         val senderId = room.getStateEvent(EventType.STATE_ROOM_MEMBER, QueryStringValue.Equals(session.myUserId))?.senderId
         val senderDisplayName = senderId?.takeIf { it != session.myUserId }?.let {
-            room.getRoomMember(it)?.displayName ?: it
+            room.membershipService().getRoomMember(it)?.displayName ?: it
         }
         val viewEvent = when (roomSummary.membership) {
             Membership.LEAVE -> {
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/ExplicitTermFilter.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/ExplicitTermFilter.kt
index e184e77557..b1876d2c4e 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/ExplicitTermFilter.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/ExplicitTermFilter.kt
@@ -35,7 +35,7 @@ class ExplicitTermFilter @Inject constructor(
             .toRegex(RegexOption.IGNORE_CASE)
 
     fun canSearchFor(term: String): Boolean {
-        return term !in explicitTerms  && term != "18+"
+        return term !in explicitTerms && term != "18+"
     }
 
     fun isValid(str: String): Boolean {
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt
index b8bba347fd..4802e36c42 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt
@@ -33,6 +33,7 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.platform.showOptimizedSnackbar
 import im.vector.app.core.utils.toast
 import im.vector.app.databinding.FragmentPublicRoomsBinding
+import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.permalink.NavigationInterceptor
 import im.vector.app.features.permalink.PermalinkHandler
 import kotlinx.coroutines.flow.debounce
@@ -143,7 +144,11 @@ class PublicRoomsFragment @Inject constructor(
         withState(viewModel) { state ->
             when (joinState) {
                 JoinState.JOINED -> {
-                    navigator.openRoom(requireActivity(), publicRoom.roomId)
+                    navigator.openRoom(
+                            context = requireActivity(),
+                            roomId = publicRoom.roomId,
+                            trigger = ViewRoom.Trigger.RoomDirectory
+                    )
                 }
                 else             -> {
                     // ROOM PREVIEW
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt
index f0df31342e..afee8e2638 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt
@@ -29,6 +29,7 @@ import im.vector.app.core.extensions.popBackstack
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivitySimpleBinding
 import im.vector.app.features.analytics.plan.MobileScreen
+import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.matrixto.MatrixToBottomSheet
 import im.vector.app.features.navigation.Navigator
 import im.vector.app.features.roomdirectory.createroom.CreateRoomArgs
@@ -88,8 +89,8 @@ class RoomDirectoryActivity : VectorBaseActivity<ActivitySimpleBinding>(), Matri
         }
     }
 
-    override fun mxToBottomSheetNavigateToRoom(roomId: String) {
-        navigator.openRoom(this, roomId)
+    override fun mxToBottomSheetNavigateToRoom(roomId: String, trigger: ViewRoom.Trigger?) {
+        navigator.openRoom(this, roomId, trigger = trigger)
     }
 
     override fun mxToBottomSheetSwitchToSpace(spaceId: String) {
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
index 710d4d5b5f..b2bfc53f96 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
@@ -29,6 +29,7 @@ import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.analytics.AnalyticsTracker
 import im.vector.app.features.analytics.extensions.toAnalyticsJoinedRoom
+import im.vector.app.features.analytics.plan.JoinedRoom
 import im.vector.app.features.settings.VectorPreferences
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Job
@@ -165,7 +166,8 @@ class RoomDirectoryViewModel @AssistedInject constructor(
 
         currentJob = viewModelScope.launch {
             val data = try {
-                session.getPublicRooms(roomDirectoryData.homeServer,
+                session.roomDirectoryService().getPublicRooms(
+                        roomDirectoryData.homeServer,
                         PublicRoomsParams(
                                 limit = PUBLIC_ROOMS_LIMIT,
                                 filter = PublicRoomsFilter(searchTerm = filter),
@@ -225,8 +227,8 @@ class RoomDirectoryViewModel @AssistedInject constructor(
         val viaServers = listOfNotNull(state.roomDirectoryData.homeServer)
         viewModelScope.launch {
             try {
-                session.joinRoom(action.publicRoom.roomId, viaServers = viaServers)
-                analyticsTracker.capture(action.publicRoom.toAnalyticsJoinedRoom())
+                session.roomService().joinRoom(action.publicRoom.roomId, viaServers = viaServers)
+                analyticsTracker.capture(action.publicRoom.toAnalyticsJoinedRoom(JoinedRoom.Trigger.RoomDirectory))
                 // We do not update the joiningRoomsIds here, because, the room is not joined yet regarding the sync data.
                 // Instead, we wait for the room to be joined
             } catch (failure: Throwable) {
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt
index e4c350b88e..d5ea954b64 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt
@@ -87,12 +87,14 @@ class CreateRoomActivity : VectorBaseActivity<ActivitySimpleBinding>() {
                       openAfterCreate: Boolean = true,
                       currentSpaceId: String? = null): Intent {
             return Intent(context, CreateRoomActivity::class.java).apply {
-                putExtra(Mavericks.KEY_ARG, CreateRoomArgs(
+                putExtra(
+                        Mavericks.KEY_ARG, CreateRoomArgs(
                         initialName = initialName,
                         isSpace = isSpace,
                         openAfterCreate = openAfterCreate,
                         parentSpaceId = currentSpaceId
-                ))
+                )
+                )
             }
         }
 
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
index 7dd9cb4e00..fae88ed8a2 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
@@ -146,7 +146,8 @@ class CreateRoomController @Inject constructor(
                 hint(host.stringProvider.getString(R.string.room_alias_address_hint))
                 errorMessage(
                         host.roomAliasErrorFormatter.format(
-                                (((viewState.asyncCreateRoomRequest as? Fail)?.error) as? CreateRoomFailure.AliasError)?.aliasError)
+                                (((viewState.asyncCreateRoomRequest as? Fail)?.error) as? CreateRoomFailure.AliasError)?.aliasError
+                        )
                 )
                 onTextChange { value ->
                     host.listener?.setAliasLocalPart(value)
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt
index 2871513c1f..82cc270458 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt
@@ -37,7 +37,9 @@ import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.time.Clock
 import im.vector.app.databinding.FragmentCreateRoomBinding
+import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.navigation.Navigator
 import im.vector.app.features.roomdirectory.RoomDirectorySharedAction
 import im.vector.app.features.roomdirectory.RoomDirectorySharedActionViewModel
@@ -62,7 +64,8 @@ data class CreateRoomArgs(
 class CreateRoomFragment @Inject constructor(
         private val createRoomController: CreateRoomController,
         private val createSpaceController: CreateSubSpaceController,
-        colorProvider: ColorProvider
+        colorProvider: ColorProvider,
+        clock: Clock,
 ) : VectorBaseFragment<FragmentCreateRoomBinding>(),
         CreateRoomController.Listener,
         GalleryOrCameraDialogHelper.Listener,
@@ -74,7 +77,7 @@ class CreateRoomFragment @Inject constructor(
 
     private lateinit var roomJoinRuleSharedActionViewModel: RoomJoinRuleSharedActionViewModel
 
-    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider)
+    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider, clock)
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentCreateRoomBinding {
         return FragmentCreateRoomBinding.inflate(inflater, container, false)
@@ -166,7 +169,8 @@ class CreateRoomFragment @Inject constructor(
         } else {
             listOf(RoomJoinRules.INVITE, RoomJoinRules.PUBLIC)
         }
-        RoomJoinRuleBottomSheet.newInstance(state.roomJoinRules,
+        RoomJoinRuleBottomSheet.newInstance(
+                state.roomJoinRules,
                 allowed.map { it.toOption(false) },
                 state.isSubSpace,
                 state.parentSpaceSummary?.displayName
@@ -219,20 +223,25 @@ class CreateRoomFragment @Inject constructor(
         val async = state.asyncCreateRoomRequest
         views.waitingView.root.isVisible = async is Loading
         if (async is Success) {
+            val roomId = async()
             // Navigate to freshly created room
             if (state.openAfterCreate) {
                 if (state.isSubSpace) {
                     navigator.switchToSpace(
                             requireContext(),
-                            async(),
+                            roomId,
                             Navigator.PostSwitchSpaceAction.None
                     )
                 } else {
-                    navigator.openRoom(requireActivity(), async())
+                    navigator.openRoom(
+                            context = requireActivity(),
+                            roomId = roomId,
+                            trigger = ViewRoom.Trigger.Created
+                    )
                 }
             }
 
-            sharedActionViewModel.post(RoomDirectorySharedAction.CreateRoomSuccess(async()))
+            sharedActionViewModel.post(RoomDirectorySharedAction.CreateRoomSuccess(roomId))
             sharedActionViewModel.post(RoomDirectorySharedAction.Close)
         } else {
             // Populate list with Epoxy
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
index 7d65c44a57..caf17e09d6 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
@@ -40,6 +40,7 @@ import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
 import org.matrix.android.sdk.api.session.room.alias.RoomAliasError
 import org.matrix.android.sdk.api.session.room.failure.CreateRoomFailure
@@ -74,7 +75,8 @@ class CreateRoomViewModel @AssistedInject constructor(
 
         val parentSpaceId = initialState.parentSpaceId ?: appStateHandler.safeActiveSpaceId()
 
-        val restrictedSupport = session.getHomeServerCapabilities().isFeatureSupported(HomeServerCapabilities.ROOM_CAP_RESTRICTED)
+        val restrictedSupport = session.homeServerCapabilitiesService().getHomeServerCapabilities()
+                .isFeatureSupported(HomeServerCapabilities.ROOM_CAP_RESTRICTED)
         val createRestricted = restrictedSupport == HomeServerCapabilities.RoomCapabilitySupport.SUPPORTED
 
         val defaultJoinRules = if (parentSpaceId != null && createRestricted) {
@@ -265,7 +267,7 @@ class CreateRoomViewModel @AssistedInject constructor(
                         RoomJoinRules.RESTRICTED -> {
                             state.parentSpaceId?.let {
                                 featurePreset = RestrictedRoomPreset(
-                                        session.getHomeServerCapabilities(),
+                                        session.homeServerCapabilitiesService().getHomeServerCapabilities(),
                                         listOf(RoomJoinRulesAllowEntry.restrictedToRoom(state.parentSpaceId))
                                 )
                             }
@@ -297,7 +299,7 @@ class CreateRoomViewModel @AssistedInject constructor(
 
         // TODO: Should this be non-cancellable?
         viewModelScope.launch {
-            runCatching { session.createRoom(createRoomParams) }.fold(
+            runCatching { session.roomService().createRoom(createRoomParams) }.fold(
                     { roomId ->
                         analyticsTracker.capture(CreatedRoom(isDM = createRoomParams.isDirect.orFalse()))
                         if (state.parentSpaceId != null) {
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateSubSpaceController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateSubSpaceController.kt
index e67b272c32..6d2fc15a0b 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateSubSpaceController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateSubSpaceController.kt
@@ -86,7 +86,8 @@ class CreateSubSpaceController @Inject constructor(
                 maxLength(MatrixConstants.maxAliasLocalPartLength(data.homeServerName))
                 errorMessage(
                         host.roomAliasErrorFormatter.format(
-                                (((data.asyncCreateRoomRequest as? Fail)?.error) as? CreateRoomFailure.AliasError)?.aliasError)
+                                (((data.asyncCreateRoomRequest as? Fail)?.error) as? CreateRoomFailure.AliasError)?.aliasError
+                        )
                 )
                 onTextChange { value ->
                     host.listener?.setAliasLocalPart(value)
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt
index 51af9a8286..48b6997bd4 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt
@@ -152,7 +152,7 @@ class RoomDirectoryPickerViewModel @AssistedInject constructor(
                 copy(addServerAsync = Loading())
             }
             try {
-                session.getPublicRooms(
+                session.roomDirectoryService().getPublicRooms(
                         server = enteredServer,
                         publicRoomsParams = PublicRoomsParams(limit = 1)
                 )
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
index baa6d0add1..6eed1cae36 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
@@ -38,6 +38,7 @@ import im.vector.app.core.utils.styleMatchingText
 import im.vector.app.core.utils.tappableMatchingText
 import im.vector.app.databinding.FragmentRoomPreviewNoPreviewBinding
 import im.vector.app.features.analytics.plan.MobileScreen
+import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.navigation.Navigator
 import im.vector.app.features.roomdirectory.JoinState
@@ -100,7 +101,13 @@ class RoomPreviewNoPreviewFragment @Inject constructor(
             if (state.roomType == RoomType.SPACE) {
                 navigator.switchToSpace(requireActivity(), state.roomId, Navigator.PostSwitchSpaceAction.None)
             } else {
-                navigator.openRoom(requireActivity(), state.roomId, roomPreviewData.eventId, roomPreviewData.buildTask)
+                navigator.openRoom(
+                        context = requireActivity(),
+                        roomId = state.roomId,
+                        eventId = roomPreviewData.eventId,
+                        buildTask = roomPreviewData.buildTask,
+                        trigger = ViewRoom.Trigger.MobileRoomPreview
+                )
             }
         }
 
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
index 8eefd7659d..e58feef5b3 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
@@ -27,7 +27,7 @@ import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.analytics.AnalyticsTracker
-import im.vector.app.features.analytics.extensions.toAnalyticsRoomSize
+import im.vector.app.features.analytics.extensions.toAnalyticsJoinedRoom
 import im.vector.app.features.analytics.plan.JoinedRoom
 import im.vector.app.features.roomdirectory.JoinState
 import kotlinx.coroutines.Dispatchers
@@ -37,6 +37,7 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.identity.SharedState
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
@@ -72,6 +73,7 @@ class RoomPreviewViewModel @AssistedInject constructor(
                 // we might want to check if the mail is bound to this account?
                 // if it is the invite
                 val threePids = session
+                        .profileService()
                         .getThreePids()
                         .filterIsInstance<ThreePid.Email>()
 
@@ -107,7 +109,7 @@ class RoomPreviewViewModel @AssistedInject constructor(
         }
         viewModelScope.launch(Dispatchers.IO) {
             val peekResult = tryOrNull {
-                session.peekRoom(initialState.roomAlias ?: initialState.roomId)
+                session.roomService().peekRoom(initialState.roomAlias ?: initialState.roomId)
             }
 
             when (peekResult) {
@@ -226,7 +228,7 @@ class RoomPreviewViewModel @AssistedInject constructor(
                         state.fromEmailInvite?.privateKey ?: ""
                 )
 
-                session.joinRoom(state.roomId, reason = null, thirdPartySigned)
+                session.roomService().joinRoom(state.roomId, reason = null, thirdPartySigned)
             } catch (failure: Throwable) {
                 setState {
                     copy(
@@ -246,18 +248,14 @@ class RoomPreviewViewModel @AssistedInject constructor(
         }
         viewModelScope.launch {
             try {
-                session.joinRoom(state.roomId, viaServers = state.homeServers)
-                analyticsTracker.capture(JoinedRoom(
-                        // Always false in this case (?)
-                        isDM = false,
-                        isSpace = false,
-                        roomSize = state.numJoinMembers.toAnalyticsRoomSize(),
-                ))
+                session.roomService().joinRoom(state.roomId, viaServers = state.homeServers)
                 // We do not update the joiningRoomsIds here, because, the room is not joined yet regarding the sync data.
                 // Instead, we wait for the room to be joined
             } catch (failure: Throwable) {
                 setState { copy(lastError = failure) }
             }
+            session.getRoomSummary(state.roomId)
+                    ?.let { analyticsTracker.capture(it.toAnalyticsJoinedRoom(JoinedRoom.Trigger.RoomPreview)) }
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
index 545e9f7190..adc720b0a5 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
@@ -182,6 +182,15 @@ class RoomMemberProfileController @Inject constructor(
         // More
         buildProfileSection(stringProvider.getString(R.string.room_profile_section_more))
 
+        if (!state.isMine) {
+            buildProfileAction(
+                    id = "direct",
+                    editable = false,
+                    title = stringProvider.getString(R.string.room_member_open_or_create_dm),
+                    action = { callback?.onOpenDmClicked() }
+            )
+        }
+
         buildProfileAction(
                 id = "overrideColor",
                 editable = false,
@@ -194,13 +203,6 @@ class RoomMemberProfileController @Inject constructor(
         if (!state.isMine) {
             val membership = state.asyncMembership() ?: return
 
-            buildProfileAction(
-                    id = "direct",
-                    editable = false,
-                    title = stringProvider.getString(R.string.room_member_open_or_create_dm),
-                    action = { callback?.onOpenDmClicked() }
-            )
-
             if (!state.isSpace && state.hasReadReceipt) {
                 buildProfileAction(
                         id = "read_receipt",
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
index 5fee420b21..032ab74153 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
@@ -47,8 +47,6 @@ import im.vector.app.databinding.DialogBaseEditTextBinding
 import im.vector.app.databinding.DialogShareQrCodeBinding
 import im.vector.app.databinding.FragmentMatrixProfileBinding
 import im.vector.app.databinding.ViewStubRoomMemberProfileHeaderBinding
-import im.vector.app.features.MainActivity
-import im.vector.app.features.MainActivityArgs
 import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.crypto.verification.VerificationBottomSheet
 import im.vector.app.features.displayname.getBestName
@@ -113,7 +111,8 @@ class RoomMemberProfileFragment @Inject constructor(
         headerViews.memberProfileStateView.contentView = headerViews.memberProfileInfoContainer
         views.matrixProfileRecyclerView.configureWith(roomMemberProfileController, hasFixedSize = true, disableItemAnimation = true)
         roomMemberProfileController.callback = this
-        appBarStateChangeListener = MatrixItemAppBarStateChangeListener(headerView,
+        appBarStateChangeListener = MatrixItemAppBarStateChangeListener(
+                headerView,
                 listOf(
                         views.matrixProfileToolbarAvatarImageView,
                         views.matrixProfileToolbarTitleView,
@@ -133,20 +132,13 @@ class RoomMemberProfileFragment @Inject constructor(
                 is RoomMemberProfileViewEvents.OnKickActionSuccess         -> Unit
                 is RoomMemberProfileViewEvents.OnSetPowerLevelSuccess      -> Unit
                 is RoomMemberProfileViewEvents.OnBanActionSuccess          -> Unit
-                is RoomMemberProfileViewEvents.OnIgnoreActionSuccess       -> handleOnIgnoreActionSuccess(it)
+                is RoomMemberProfileViewEvents.OnIgnoreActionSuccess       -> Unit
                 is RoomMemberProfileViewEvents.OnInviteActionSuccess       -> Unit
             }
         }
         setupLongClicks()
     }
 
-    private fun handleOnIgnoreActionSuccess(action: RoomMemberProfileViewEvents.OnIgnoreActionSuccess) {
-        if (action.shouldPerformInitialSync) {
-            // A user has been un-ignored, perform a initial sync
-            MainActivity.restartApp(requireActivity(), MainActivityArgs(clearCache = true))
-        }
-    }
-
     private fun setupLongClicks() {
         headerViews.memberProfileNameView.copyOnLongClick()
         headerViews.memberProfileIdView.copyOnLongClick()
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewEvents.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewEvents.kt
index 1857f5cdc4..efe23eeff0 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewEvents.kt
@@ -25,7 +25,7 @@ sealed class RoomMemberProfileViewEvents : VectorViewEvents {
     data class Loading(val message: CharSequence? = null) : RoomMemberProfileViewEvents()
     data class Failure(val throwable: Throwable) : RoomMemberProfileViewEvents()
 
-    data class OnIgnoreActionSuccess(val shouldPerformInitialSync: Boolean) : RoomMemberProfileViewEvents()
+    object OnIgnoreActionSuccess : RoomMemberProfileViewEvents()
     object OnSetPowerLevelSuccess : RoomMemberProfileViewEvents()
     object OnInviteActionSuccess : RoomMemberProfileViewEvents()
     object OnKickActionSuccess : RoomMemberProfileViewEvents()
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
index addc2c71ef..fb1e222080 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
@@ -48,6 +48,7 @@ import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.members.roomMemberQueryParams
 import org.matrix.android.sdk.api.session.room.model.Membership
@@ -86,8 +87,8 @@ class RoomMemberProfileViewModel @AssistedInject constructor(
         setState {
             copy(
                     isMine = session.myUserId == this.userId,
-                    userMatrixItem = room?.getRoomMember(initialState.userId)?.toMatrixItem()?.let { Success(it) } ?: Uninitialized,
-                    hasReadReceipt = room?.getUserReadReceipt(initialState.userId) != null,
+                    userMatrixItem = room?.membershipService()?.getRoomMember(initialState.userId)?.toMatrixItem()?.let { Success(it) } ?: Uninitialized,
+                    hasReadReceipt = room?.readService()?.getUserReadReceipt(initialState.userId) != null,
                     isSpace = room?.roomSummary()?.roomType == RoomType.SPACE
             )
         }
@@ -96,7 +97,7 @@ class RoomMemberProfileViewModel @AssistedInject constructor(
         viewModelScope.launch(Dispatchers.Main) {
             // Do we have a room member for this id.
             val roomMember = withContext(Dispatchers.Default) {
-                room?.getRoomMember(initialState.userId)
+                room?.membershipService()?.getRoomMember(initialState.userId)
             }
             // If not, we look for profile info on the server
             if (room == null || roomMember == null) {
@@ -227,7 +228,7 @@ class RoomMemberProfileViewModel @AssistedInject constructor(
             viewModelScope.launch {
                 _viewEvents.post(RoomMemberProfileViewEvents.Loading())
                 try {
-                    room.sendStateEvent(EventType.STATE_ROOM_POWER_LEVELS, stateKey = "", newPowerLevelsContent)
+                    room.stateService().sendStateEvent(EventType.STATE_ROOM_POWER_LEVELS, stateKey = "", newPowerLevelsContent)
                     _viewEvents.post(RoomMemberProfileViewEvents.OnSetPowerLevelSuccess)
                 } catch (failure: Throwable) {
                     _viewEvents.post(RoomMemberProfileViewEvents.Failure(failure))
@@ -241,10 +242,12 @@ class RoomMemberProfileViewModel @AssistedInject constructor(
         if (state.isRoomEncrypted) {
             if (!state.isMine && state.userMXCrossSigningInfo?.isTrusted() == false) {
                 // ok, let's find or create the DM room
-                _viewEvents.post(RoomMemberProfileViewEvents.StartVerification(
-                        userId = state.userId,
-                        canCrossSign = session.cryptoService().crossSigningService().canCrossSign()
-                ))
+                _viewEvents.post(
+                        RoomMemberProfileViewEvents.StartVerification(
+                                userId = state.userId,
+                                canCrossSign = session.cryptoService().crossSigningService().canCrossSign()
+                        )
+                )
             }
         }
     }
@@ -256,7 +259,7 @@ class RoomMemberProfileViewModel @AssistedInject constructor(
         viewModelScope.launch {
             try {
                 _viewEvents.post(RoomMemberProfileViewEvents.Loading())
-                room.invite(initialState.userId)
+                room.membershipService().invite(initialState.userId)
                 _viewEvents.post(RoomMemberProfileViewEvents.OnInviteActionSuccess)
             } catch (failure: Throwable) {
                 _viewEvents.post(RoomMemberProfileViewEvents.Failure(failure))
@@ -271,7 +274,7 @@ class RoomMemberProfileViewModel @AssistedInject constructor(
         viewModelScope.launch {
             try {
                 _viewEvents.post(RoomMemberProfileViewEvents.Loading())
-                room.remove(initialState.userId, action.reason)
+                room.membershipService().remove(initialState.userId, action.reason)
                 _viewEvents.post(RoomMemberProfileViewEvents.OnKickActionSuccess)
             } catch (failure: Throwable) {
                 _viewEvents.post(RoomMemberProfileViewEvents.Failure(failure))
@@ -288,9 +291,9 @@ class RoomMemberProfileViewModel @AssistedInject constructor(
             try {
                 _viewEvents.post(RoomMemberProfileViewEvents.Loading())
                 if (membership == Membership.BAN) {
-                    room.unban(initialState.userId, action.reason)
+                    room.membershipService().unban(initialState.userId, action.reason)
                 } else {
-                    room.ban(initialState.userId, action.reason)
+                    room.membershipService().ban(initialState.userId, action.reason)
                 }
                 _viewEvents.post(RoomMemberProfileViewEvents.OnBanActionSuccess)
             } catch (failure: Throwable) {
@@ -327,7 +330,8 @@ class RoomMemberProfileViewModel @AssistedInject constructor(
 
     private suspend fun fetchProfileInfo() {
         val result = runCatchingToAsync {
-            session.getProfile(initialState.userId)
+            session.profileService()
+                    .getProfile(initialState.userId)
                     .let { User.fromJson(initialState.userId, it) }
                     .toMatrixItem()
         }
@@ -386,11 +390,11 @@ class RoomMemberProfileViewModel @AssistedInject constructor(
         viewModelScope.launch {
             val event = try {
                 if (isIgnored) {
-                    session.unIgnoreUserIds(listOf(state.userId))
+                    session.userService().unIgnoreUserIds(listOf(state.userId))
                 } else {
-                    session.ignoreUserIds(listOf(state.userId))
+                    session.userService().ignoreUserIds(listOf(state.userId))
                 }
-                RoomMemberProfileViewEvents.OnIgnoreActionSuccess(isIgnored)
+                RoomMemberProfileViewEvents.OnIgnoreActionSuccess
             } catch (failure: Throwable) {
                 RoomMemberProfileViewEvents.Failure(failure)
             }
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt
index 8df0b3ffd5..35f431db1d 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt
@@ -96,7 +96,8 @@ class DeviceListBottomSheet :
     private fun showFragment(fragmentClass: KClass<out Fragment>, bundle: Bundle) {
         if (childFragmentManager.findFragmentByTag(fragmentClass.simpleName) == null) {
             childFragmentManager.commitTransaction {
-                replace(R.id.bottomSheetFragmentContainer,
+                replace(
+                        R.id.bottomSheetFragmentContainer,
                         fragmentClass.java,
                         bundle,
                         fragmentClass.simpleName
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt
index 5c64232a5a..19040a1fde 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt
@@ -33,6 +33,7 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
 import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
+import org.matrix.android.sdk.api.session.getUser
 import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.flow.flow
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
index a52f56870a..0e25ec5f8f 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
@@ -36,7 +36,7 @@ class DeviceTrustInfoEpoxyController @Inject constructor(private val stringProvi
                                                          private val colorProvider: ColorProvider,
                                                          private val dimensionConverter: DimensionConverter,
                                                          private val vectorPreferences: VectorPreferences) :
-    TypedEpoxyController<DeviceListViewState>() {
+        TypedEpoxyController<DeviceListViewState>() {
 
     interface InteractionListener {
         fun onVerifyManually(device: CryptoDeviceInfo)
@@ -65,14 +65,22 @@ class DeviceTrustInfoEpoxyController @Inject constructor(private val stringProvi
                 apply {
                     if (isVerified) {
                         // TODO FORMAT
-                        text(host.stringProvider.getString(R.string.verification_profile_device_verified_because,
-                                data.userItem?.displayName ?: "",
-                                data.userItem?.id ?: "").toEpoxyCharSequence())
+                        text(
+                                host.stringProvider.getString(
+                                        R.string.verification_profile_device_verified_because,
+                                        data.userItem?.displayName ?: "",
+                                        data.userItem?.id ?: ""
+                                ).toEpoxyCharSequence()
+                        )
                     } else {
                         // TODO what if mine
-                        text(host.stringProvider.getString(R.string.verification_profile_device_new_signing,
-                                data.userItem?.displayName ?: "",
-                                data.userItem?.id ?: "").toEpoxyCharSequence())
+                        text(
+                                host.stringProvider.getString(
+                                        R.string.verification_profile_device_new_signing,
+                                        data.userItem?.displayName ?: "",
+                                        data.userItem?.id ?: ""
+                                ).toEpoxyCharSequence()
+                        )
                     }
                 }
 //                    text(stringProvider.getString(R.string.verification_profile_device_untrust_info))
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
index 12a5d94eca..29a2f73c78 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
@@ -84,21 +84,21 @@ class RoomProfileActivity :
                     addFragment(views.simpleFragmentContainer, RoomProfileFragment::class.java, roomProfileArgs)
                     addFragmentToBackstack(views.simpleFragmentContainer, RoomSettingsFragment::class.java, roomProfileArgs)
                 }
-                EXTRA_DIRECT_ACCESS_ROOM_MEMBERS -> {
+                EXTRA_DIRECT_ACCESS_ROOM_MEMBERS  -> {
                     addFragment(views.simpleFragmentContainer, RoomMemberListFragment::class.java, roomProfileArgs)
                 }
-                else -> addFragment(views.simpleFragmentContainer, RoomProfileFragment::class.java, roomProfileArgs)
+                else                              -> addFragment(views.simpleFragmentContainer, RoomProfileFragment::class.java, roomProfileArgs)
             }
         }
         sharedActionViewModel
                 .stream()
                 .onEach { sharedAction ->
                     when (sharedAction) {
-                        RoomProfileSharedAction.OpenRoomMembers                 -> openRoomMembers()
-                        RoomProfileSharedAction.OpenRoomSettings                -> openRoomSettings()
-                        RoomProfileSharedAction.OpenRoomAliasesSettings         -> openRoomAlias()
-                        RoomProfileSharedAction.OpenRoomPermissionsSettings     -> openRoomPermissions()
-                        RoomProfileSharedAction.OpenRoomUploads                 -> openRoomUploads()
+                        RoomProfileSharedAction.OpenRoomMembers              -> openRoomMembers()
+                        RoomProfileSharedAction.OpenRoomSettings             -> openRoomSettings()
+                        RoomProfileSharedAction.OpenRoomAliasesSettings      -> openRoomAlias()
+                        RoomProfileSharedAction.OpenRoomPermissionsSettings  -> openRoomPermissions()
+                        RoomProfileSharedAction.OpenRoomUploads              -> openRoomUploads()
                         RoomProfileSharedAction.OpenBannedRoomMembers        -> openBannedRoomMembers()
                         RoomProfileSharedAction.OpenRoomNotificationSettings -> openRoomNotificationSettings()
                     }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
index 372b4e5a70..06f56bff89 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
@@ -179,11 +179,13 @@ class RoomProfileController @Inject constructor(
         buildProfileSection(stringProvider.getString(R.string.room_profile_section_more))
         buildProfileAction(
                 id = "settings",
-                title = stringProvider.getString(if (roomSummary.isDirect) {
-                    R.string.direct_room_profile_section_more_settings
-                } else {
-                    R.string.room_profile_section_more_settings
-                }),
+                title = stringProvider.getString(
+                        if (roomSummary.isDirect) {
+                            R.string.direct_room_profile_section_more_settings
+                        } else {
+                            R.string.room_profile_section_more_settings
+                        }
+                ),
                 icon = R.drawable.ic_room_profile_settings,
                 action = { callback?.onSettingsClicked() }
         )
@@ -228,11 +230,13 @@ class RoomProfileController @Inject constructor(
         }
         buildProfileAction(
                 id = "leave",
-                title = stringProvider.getString(if (roomSummary.isDirect) {
-                    R.string.direct_room_profile_section_more_leave
-                } else {
-                    R.string.room_profile_section_more_leave
-                }),
+                title = stringProvider.getString(
+                        if (roomSummary.isDirect) {
+                            R.string.direct_room_profile_section_more_leave
+                        } else {
+                            R.string.room_profile_section_more_leave
+                        }
+                ),
                 divider = false,
                 destructive = true,
                 icon = R.drawable.ic_room_actions_leave,
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
index 3944066584..7be92bfdcf 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
@@ -113,9 +113,11 @@ class RoomProfileFragment @Inject constructor(
         setupRecyclerView()
         appBarStateChangeListener = MatrixItemAppBarStateChangeListener(
                 headerView,
-                listOf(views.matrixProfileToolbarAvatarImageView,
+                listOf(
+                        views.matrixProfileToolbarAvatarImageView,
                         views.matrixProfileToolbarTitleView,
-                        views.matrixProfileDecorationToolbarAvatarImageView)
+                        views.matrixProfileDecorationToolbarAvatarImageView
+                )
         )
         views.matrixProfileAppBarLayout.addOnOffsetChangedListener(appBarStateChangeListener)
         roomProfileViewModel.observeViewEvents {
@@ -269,11 +271,13 @@ class RoomProfileFragment @Inject constructor(
     override fun createShortcut() {
         // Ask the view model to prepare it...
         roomProfileViewModel.handle(RoomProfileAction.CreateShortcut)
-        analyticsTracker.capture(Interaction(
-                index = null,
-                interactionType = null,
-                name = Interaction.Name.MobileRoomAddHome
-        ))
+        analyticsTracker.capture(
+                Interaction(
+                        index = null,
+                        interactionType = null,
+                        name = Interaction.Name.MobileRoomAddHome
+                )
+        )
     }
 
     private fun addShortcut(onShortcutReady: RoomProfileViewEvents.OnShortcutReady) {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
index 7c6623b087..1428dc0cf0 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
@@ -39,6 +39,8 @@ import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.getStateEvent
 import org.matrix.android.sdk.api.session.room.members.roomMemberQueryParams
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
@@ -96,9 +98,9 @@ class RoomProfileViewModel @AssistedInject constructor(
                     copy(
                             roomCreateContent = async,
                             // This is a shortcut, we should do the next lines elsewhere, but keep it like that for the moment.
-                            recommendedRoomVersion = room.getRecommendedVersion(),
-                            isUsingUnstableRoomVersion = room.isUsingUnstableRoomVersion(),
-                            canUpgradeRoom = room.userMayUpgradeRoom(session.myUserId),
+                            recommendedRoomVersion = room.roomVersionService().getRecommendedVersion(),
+                            isUsingUnstableRoomVersion = room.roomVersionService().isUsingUnstableRoomVersion(),
+                            canUpgradeRoom = room.roomVersionService().userMayUpgradeRoom(session.myUserId),
                             isTombstoned = room.getStateEvent(EventType.STATE_ROOM_TOMBSTONE) != null
                     )
                 }
@@ -143,14 +145,14 @@ class RoomProfileViewModel @AssistedInject constructor(
     }
 
     fun isPublicRoom(): Boolean {
-        return room.isPublic()
+        return room.stateService().isPublic()
     }
 
     private fun handleEnableEncryption() {
         postLoading(true)
 
         viewModelScope.launch {
-            val result = runCatching { room.enableEncryption() }
+            val result = runCatching { room.roomCryptoService().enableEncryption() }
             postLoading(false)
             result.onFailure { failure ->
                 _viewEvents.post(RoomProfileViewEvents.Failure(failure))
@@ -177,7 +179,7 @@ class RoomProfileViewModel @AssistedInject constructor(
     private fun handleChangeNotificationMode(action: RoomProfileAction.ChangeRoomNotificationState) {
         viewModelScope.launch {
             try {
-                room.setRoomNotificationState(action.notificationState)
+                room.roomPushRuleService().setRoomNotificationState(action.notificationState)
             } catch (failure: Throwable) {
                 _viewEvents.post(RoomProfileViewEvents.Failure(failure))
             }
@@ -188,12 +190,14 @@ class RoomProfileViewModel @AssistedInject constructor(
         _viewEvents.post(RoomProfileViewEvents.Loading(stringProvider.getString(R.string.room_profile_leaving_room)))
         viewModelScope.launch {
             try {
-                session.leaveRoom(room.roomId)
-                analyticsTracker.capture(Interaction(
-                        index = null,
-                        interactionType = null,
-                        name = Interaction.Name.MobileRoomLeave
-                ))
+                session.roomService().leaveRoom(room.roomId)
+                analyticsTracker.capture(
+                        Interaction(
+                                index = null,
+                                interactionType = null,
+                                name = Interaction.Name.MobileRoomLeave
+                        )
+                )
                 // Do nothing, we will be closing the room automatically when it will get back from sync
             } catch (failure: Throwable) {
                 _viewEvents.post(RoomProfileViewEvents.Failure(failure))
@@ -212,7 +216,7 @@ class RoomProfileViewModel @AssistedInject constructor(
         _viewEvents.post(RoomProfileViewEvents.Loading())
         session.coroutineScope.launch {
             try {
-                room.enableEncryption(force = true)
+                room.roomCryptoService().enableEncryption(force = true)
             } catch (failure: Throwable) {
                 Timber.e(failure, "Failed to restore encryption state in room ${room.roomId}")
                 _viewEvents.post(RoomProfileViewEvents.Failure(failure))
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt
index fcf6bc3a47..3db1e384bc 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt
@@ -98,8 +98,12 @@ class RoomAliasController @Inject constructor(
             is Fail       -> {
                 errorWithRetryItem {
                     id("rd_error")
-                    text(host.stringProvider.getString(R.string.room_alias_publish_to_directory_error,
-                            host.errorFormatter.toHumanReadable(data.roomDirectoryVisibility.error)))
+                    text(
+                            host.stringProvider.getString(
+                                    R.string.room_alias_publish_to_directory_error,
+                                    host.errorFormatter.toHumanReadable(data.roomDirectoryVisibility.error)
+                            )
+                    )
                     listener { host.callback?.retry() }
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasViewModel.kt
index adffbcbd06..2641eb4184 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasViewModel.kt
@@ -36,6 +36,7 @@ import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.model.RoomCanonicalAliasContent
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.flow.flow
@@ -72,7 +73,7 @@ class RoomAliasViewModel @AssistedInject constructor(@Assisted initialState: Roo
         }
         viewModelScope.launch {
             runCatching {
-                session.getRoomDirectoryVisibility(room.roomId)
+                session.roomDirectoryService().getRoomDirectoryVisibility(room.roomId)
             }.fold(
                     {
                         setState {
@@ -108,7 +109,7 @@ class RoomAliasViewModel @AssistedInject constructor(@Assisted initialState: Roo
         }
 
         viewModelScope.launch {
-            runCatching { room.getRoomAliases() }
+            runCatching { room.aliasService().getRoomAliases() }
                     .fold(
                             {
                                 setState { copy(localAliases = Success(it.sorted())) }
@@ -205,7 +206,7 @@ class RoomAliasViewModel @AssistedInject constructor(@Assisted initialState: Roo
         postLoading(true)
         viewModelScope.launch {
             runCatching {
-                session.setRoomDirectoryVisibility(room.roomId, action.roomDirectoryVisibility)
+                session.roomDirectoryService().setRoomDirectoryVisibility(room.roomId, action.roomDirectoryVisibility)
             }.fold(
                     {
                         setState {
@@ -303,7 +304,7 @@ class RoomAliasViewModel @AssistedInject constructor(@Assisted initialState: Roo
         postLoading(true)
         viewModelScope.launch {
             try {
-                room.updateCanonicalAlias(canonicalAlias, alternativeAliases)
+                room.stateService().updateCanonicalAlias(canonicalAlias, alternativeAliases)
                 setState {
                     copy(
                             isLoading = false,
@@ -327,7 +328,7 @@ class RoomAliasViewModel @AssistedInject constructor(@Assisted initialState: Roo
             )
         }
         viewModelScope.launch {
-            runCatching { room.addAlias(previousState.value) }
+            runCatching { room.aliasService().addAlias(previousState.value) }
                     .onFailure {
                         setState {
                             copy(
@@ -354,7 +355,7 @@ class RoomAliasViewModel @AssistedInject constructor(@Assisted initialState: Roo
     private fun handleRemoveLocalAlias(action: RoomAliasAction.RemoveLocalAlias) {
         postLoading(true)
         viewModelScope.launch {
-            runCatching { session.deleteRoomAlias(action.alias) }
+            runCatching { session.roomService().deleteRoomAlias(action.alias) }
                     .onFailure {
                         setState {
                             copy(isLoading = false)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheet.kt b/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheet.kt
index 56dbcbfba4..6e4613c03c 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheet.kt
@@ -92,13 +92,15 @@ class RoomAliasBottomSheet :
                         isLocal: Boolean,
                         canEditCanonicalAlias: Boolean): RoomAliasBottomSheet {
             return RoomAliasBottomSheet().apply {
-                setArguments(RoomAliasBottomSheetArgs(
-                        alias = alias,
-                        isPublished = isPublished,
-                        isMainAlias = isMainAlias,
-                        isLocal = isLocal,
-                        canEditCanonicalAlias = canEditCanonicalAlias
-                ))
+                setArguments(
+                        RoomAliasBottomSheetArgs(
+                                alias = alias,
+                                isPublished = isPublished,
+                                isMainAlias = isMainAlias,
+                                isLocal = isLocal,
+                                canEditCanonicalAlias = canEditCanonicalAlias
+                        )
+                )
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheetSharedAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheetSharedAction.kt
index 7625972b05..d50c19635d 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheetSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/alias/detail/RoomAliasBottomSheetSharedAction.kt
@@ -25,7 +25,7 @@ sealed class RoomAliasBottomSheetSharedAction(
         @StringRes val titleRes: Int,
         @DrawableRes val iconResId: Int = 0,
         val destructive: Boolean = false) :
-    VectorSharedAction {
+        VectorSharedAction {
 
     data class ShareAlias(val matrixTo: String) : RoomAliasBottomSheetSharedAction(
             R.string.action_share,
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewModel.kt
index ec249c75ba..1fef5e8ff2 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewModel.kt
@@ -32,6 +32,8 @@ import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.getStateEvent
 import org.matrix.android.sdk.api.session.room.members.roomMemberQueryParams
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
@@ -114,7 +116,7 @@ class RoomBannedMemberListViewModel @AssistedInject constructor(@Assisted initia
         }
         viewModelScope.launch(Dispatchers.IO) {
             try {
-                room.unban(roomMemberSummary.userId, null)
+                room.membershipService().unban(roomMemberSummary.userId, null)
             } catch (failure: Throwable) {
                 _viewEvents.post(RoomBannedMemberListViewEvents.ToastError(stringProvider.getString(R.string.failed_to_unban)))
             } finally {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
index 07236fb397..ebcebfa470 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
@@ -133,6 +133,7 @@ class RoomMemberListController @Inject constructor(
             }
             showPresence(true)
             userPresence(roomMember.userPresence)
+            ignoredUser(roomMember.userId in data.ignoredUserIds)
             powerLevelLabel(
                     span {
                         span(powerLabel) {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
index 1adf35a098..8863d18560 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
@@ -39,6 +39,7 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.members.roomMemberQueryParams
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
@@ -69,6 +70,7 @@ class RoomMemberListViewModel @AssistedInject constructor(@Assisted initialState
         observeThirdPartyInvites()
         observeRoomSummary()
         observePowerLevel()
+        observeIgnoredUsers()
     }
 
     private fun observeRoomMemberSummaries() {
@@ -90,7 +92,7 @@ class RoomMemberListViewModel @AssistedInject constructor(@Assisted initialState
                     copy(roomMemberSummaries = async)
                 }
 
-        if (room.isEncrypted()) {
+        if (room.roomCryptoService().isEncrypted()) {
             room.flow().liveRoomMembers(roomMemberQueryParams)
                     .flatMapLatest { membersSummary ->
                         session.cryptoService().getLiveCryptoDeviceInfo(membersSummary.map { it.userId })
@@ -148,6 +150,16 @@ class RoomMemberListViewModel @AssistedInject constructor(@Assisted initialState
                 }
     }
 
+    private fun observeIgnoredUsers() {
+        session.flow()
+                .liveIgnoredUsers()
+                .execute { async ->
+                    copy(
+                            ignoredUserIds = async.invoke().orEmpty().map { it.userId }
+                    )
+                }
+    }
+
     private fun buildRoomMemberSummaries(powerLevelsContent: PowerLevelsContent, roomMembers: List<RoomMemberSummary>): RoomMemberSummaries {
         val admins = ArrayList<RoomMemberSummary>()
         val moderators = ArrayList<RoomMemberSummary>()
@@ -185,7 +197,7 @@ class RoomMemberListViewModel @AssistedInject constructor(@Assisted initialState
 
     private fun handleRevokeThreePidInvite(action: RoomMemberListAction.RevokeThreePidInvite) {
         viewModelScope.launch {
-            room.sendStateEvent(
+            room.stateService().sendStateEvent(
                     eventType = EventType.STATE_ROOM_THIRD_PARTY_INVITE,
                     stateKey = action.stateKey,
                     body = emptyMap()
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
index 93ed7fa719..47a89b523a 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
@@ -32,6 +32,7 @@ data class RoomMemberListViewState(
         val roomId: String,
         val roomSummary: Async<RoomSummary> = Uninitialized,
         val roomMemberSummaries: Async<RoomMemberSummaries> = Uninitialized,
+        val ignoredUserIds: List<String> = emptyList(),
         val filter: String = "",
         val threePidInvites: Async<List<Event>> = Uninitialized,
         val trustLevelMap: Async<Map<String, RoomEncryptionTrustLevel?>> = Uninitialized,
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsController.kt
index 8f6e8f54c1..3ee0a00f28 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsController.kt
@@ -42,7 +42,7 @@ class RoomNotificationSettingsController @Inject constructor() : TypedEpoxyContr
             id("roomNotificationSettingsHeader")
             textRes(R.string.room_settings_room_notifications_notify_me)
         }
-        data.notificationOptions.forEach {  notificationState ->
+        data.notificationOptions.forEach { notificationState ->
             val title = titleForNotificationState(notificationState)
             radioButtonItem {
                 id(notificationState.name)
@@ -67,6 +67,6 @@ class RoomNotificationSettingsController @Inject constructor() : TypedEpoxyContr
         RoomNotificationState.ALL_MESSAGES_NOISY -> R.string.room_settings_all_messages
         RoomNotificationState.MENTIONS_ONLY      -> R.string.room_settings_mention_and_keyword_only
         RoomNotificationState.MUTE               -> R.string.room_settings_none
-        else -> null
+        else                                     -> null
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewModel.kt
index 26db6b001e..be7e9173b1 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewModel.kt
@@ -26,6 +26,7 @@ import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.flow.flow
 import org.matrix.android.sdk.flow.unwrap
 
@@ -36,7 +37,7 @@ class RoomNotificationSettingsViewModel @AssistedInject constructor(
 
     @AssistedFactory
     interface Factory : MavericksAssistedViewModelFactory<RoomNotificationSettingsViewModel, RoomNotificationSettingsViewState> {
-       override fun create(initialState: RoomNotificationSettingsViewState): RoomNotificationSettingsViewModel
+        override fun create(initialState: RoomNotificationSettingsViewState): RoomNotificationSettingsViewModel
     }
 
     companion object : MavericksViewModelFactory<RoomNotificationSettingsViewModel, RoomNotificationSettingsViewState> by hiltMavericksViewModelFactory()
@@ -73,7 +74,7 @@ class RoomNotificationSettingsViewModel @AssistedInject constructor(
     private fun handleSelectNotificationState(action: RoomNotificationSettingsAction.SelectNotificationState) {
         setState { copy(isLoading = true) }
         viewModelScope.launch {
-            runCatching {  room.setRoomNotificationState(action.notificationState) }
+            runCatching { room.roomPushRuleService().setRoomNotificationState(action.notificationState) }
                     .fold(
                             {
                                 setState {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt
index d6d1176c36..5c1e9e6bc5 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt
@@ -30,7 +30,7 @@ data class RoomNotificationSettingsViewState(
         val roomSummary: Async<RoomSummary> = Uninitialized,
         val isLoading: Boolean = false,
         val notificationState: Async<RoomNotificationState> = Uninitialized
-)  : MavericksState {
+) : MavericksState {
     constructor(args: RoomProfileArgs) : this(roomId = args.roomId)
     constructor(args: RoomListActionsArgs) : this(roomId = args.roomId)
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt
index 9590d1bbc3..fffae6159c 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt
@@ -132,12 +132,15 @@ class RoomPermissionsController @Inject constructor(
 
         settingsInfoItem {
             id("notice")
-            helperText(host.stringProvider.getString(
-                    if (editable) {
-                        if (isSpace) R.string.space_permissions_notice else R.string.room_permissions_notice
-                    } else {
-                        if (isSpace) R.string.space_permissions_notice_read_only else R.string.room_permissions_notice_read_only
-                    }))
+            helperText(
+                    host.stringProvider.getString(
+                            if (editable) {
+                                if (isSpace) R.string.space_permissions_notice else R.string.room_permissions_notice
+                            } else {
+                                if (isSpace) R.string.space_permissions_notice_read_only else R.string.room_permissions_notice_read_only
+                            }
+                    )
+            )
         }
 
         // Useful permissions
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsViewModel.kt
index 6fbc545b6c..e387cca004 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsViewModel.kt
@@ -31,6 +31,7 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.flow.flow
@@ -38,7 +39,7 @@ import org.matrix.android.sdk.flow.unwrap
 
 class RoomPermissionsViewModel @AssistedInject constructor(@Assisted initialState: RoomPermissionsViewState,
                                                            private val session: Session) :
-    VectorViewModel<RoomPermissionsViewState, RoomPermissionsAction, RoomPermissionsViewEvents>(initialState) {
+        VectorViewModel<RoomPermissionsViewState, RoomPermissionsAction, RoomPermissionsViewEvents>(initialState) {
 
     @AssistedFactory
     interface Factory : MavericksAssistedViewModelFactory<RoomPermissionsViewModel, RoomPermissionsViewState> {
@@ -123,7 +124,7 @@ class RoomPermissionsViewModel @AssistedInject constructor(@Assisted initialStat
                                 }
                         )
                     }
-                    room.sendStateEvent(EventType.STATE_ROOM_POWER_LEVELS, stateKey = "", newPowerLevelsContent.toContent())
+                    room.stateService().sendStateEvent(EventType.STATE_ROOM_POWER_LEVELS, stateKey = "", newPowerLevelsContent.toContent())
                     setState {
                         copy(
                                 isLoading = false
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
index eb69e36ba0..85151e1258 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
@@ -37,6 +37,7 @@ import im.vector.app.core.intent.getFilenameFromUri
 import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.time.Clock
 import im.vector.app.core.utils.toast
 import im.vector.app.databinding.FragmentRoomSettingGenericBinding
 import im.vector.app.features.analytics.plan.MobileScreen
@@ -57,7 +58,8 @@ import javax.inject.Inject
 class RoomSettingsFragment @Inject constructor(
         private val controller: RoomSettingsController,
         colorProvider: ColorProvider,
-        private val avatarRenderer: AvatarRenderer
+        private val avatarRenderer: AvatarRenderer,
+        clock: Clock,
 ) :
         VectorBaseFragment<FragmentRoomSettingGenericBinding>(),
         RoomSettingsController.Callback,
@@ -70,7 +72,7 @@ class RoomSettingsFragment @Inject constructor(
     private lateinit var roomJoinRuleSharedActionViewModel: RoomJoinRuleSharedActionViewModel
 
     private val roomProfileArgs: RoomProfileArgs by args()
-    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider)
+    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider, clock)
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRoomSettingGenericBinding {
         return FragmentRoomSettingGenericBinding.inflate(inflater, container, false)
@@ -198,7 +200,8 @@ class RoomSettingsFragment @Inject constructor(
                 RoomSettingsAction.SetAvatarAction(
                         RoomSettingsViewState.AvatarAction.UpdateAvatar(
                                 newAvatarUri = uri,
-                                newAvatarFileName = getFilenameFromUri(requireContext(), uri) ?: UUID.randomUUID().toString())
+                                newAvatarFileName = getFilenameFromUri(requireContext(), uri) ?: UUID.randomUUID().toString()
+                        )
                 )
         )
     }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
index 8ad5bcdce6..ee04d22ddc 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
@@ -35,6 +35,7 @@ import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
 import org.matrix.android.sdk.api.session.room.model.RoomAvatarContent
 import org.matrix.android.sdk.api.session.room.model.RoomGuestAccessContent
@@ -67,9 +68,9 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
         observeRoomAvatar()
         observeState()
 
-        val homeServerCapabilities = session.getHomeServerCapabilities()
+        val homeServerCapabilities = session.homeServerCapabilitiesService().getHomeServerCapabilities()
         val canUseRestricted = homeServerCapabilities
-                .isFeatureSupported(HomeServerCapabilities.ROOM_CAP_RESTRICTED, room.getRoomVersion())
+                .isFeatureSupported(HomeServerCapabilities.ROOM_CAP_RESTRICTED, room.roomVersionService().getRoomVersion())
 
         val restrictedSupport = homeServerCapabilities.isFeatureSupported(HomeServerCapabilities.ROOM_CAP_RESTRICTED)
         val couldUpgradeToRestricted = restrictedSupport == HomeServerCapabilities.RoomCapabilitySupport.SUPPORTED
@@ -89,12 +90,13 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
                 RoomSettingsViewState::newTopic,
                 RoomSettingsViewState::newHistoryVisibility,
                 RoomSettingsViewState::newRoomJoinRules,
-                RoomSettingsViewState::roomSummary) { avatarAction,
-                                                      newName,
-                                                      newTopic,
-                                                      newHistoryVisibility,
-                                                      newJoinRule,
-                                                      asyncSummary ->
+                RoomSettingsViewState::roomSummary
+        ) { avatarAction,
+            newName,
+            newTopic,
+            newHistoryVisibility,
+            newJoinRule,
+            asyncSummary ->
             val summary = asyncSummary()
             setState {
                 copy(
@@ -129,14 +131,22 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
                             canChangeAvatar = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, EventType.STATE_ROOM_AVATAR),
                             canChangeName = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, EventType.STATE_ROOM_NAME),
                             canChangeTopic = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, EventType.STATE_ROOM_TOPIC),
-                            canChangeHistoryVisibility = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true,
-                                    EventType.STATE_ROOM_HISTORY_VISIBILITY),
-                            canChangeJoinRule = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true,
-                                    EventType.STATE_ROOM_JOIN_RULES) &&
-                                    powerLevelsHelper.isUserAllowedToSend(session.myUserId, true,
-                                            EventType.STATE_ROOM_GUEST_ACCESS),
-                            canAddChildren = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true,
-                                    EventType.STATE_SPACE_CHILD)
+                            canChangeHistoryVisibility = powerLevelsHelper.isUserAllowedToSend(
+                                    session.myUserId, true,
+                                    EventType.STATE_ROOM_HISTORY_VISIBILITY
+                            ),
+                            canChangeJoinRule = powerLevelsHelper.isUserAllowedToSend(
+                                    session.myUserId, true,
+                                    EventType.STATE_ROOM_JOIN_RULES
+                            ) &&
+                                    powerLevelsHelper.isUserAllowedToSend(
+                                            session.myUserId, true,
+                                            EventType.STATE_ROOM_GUEST_ACCESS
+                                    ),
+                            canAddChildren = powerLevelsHelper.isUserAllowedToSend(
+                                    session.myUserId, true,
+                                    EventType.STATE_SPACE_CHILD
+                            )
                     )
                     setState {
                         copy(actionPermissions = permissions)
@@ -248,25 +258,25 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
         when (val avatarAction = state.avatarAction) {
             RoomSettingsViewState.AvatarAction.None            -> Unit
             RoomSettingsViewState.AvatarAction.DeleteAvatar    -> {
-                operationList.add { room.deleteAvatar() }
+                operationList.add { room.stateService().deleteAvatar() }
             }
             is RoomSettingsViewState.AvatarAction.UpdateAvatar -> {
-                operationList.add { room.updateAvatar(avatarAction.newAvatarUri, avatarAction.newAvatarFileName) }
+                operationList.add { room.stateService().updateAvatar(avatarAction.newAvatarUri, avatarAction.newAvatarFileName) }
             }
         }
         if (summary?.name != state.newName) {
-            operationList.add { room.updateName(state.newName ?: "") }
+            operationList.add { room.stateService().updateName(state.newName ?: "") }
         }
         if (summary?.topic != state.newTopic) {
-            operationList.add { room.updateTopic(state.newTopic ?: "") }
+            operationList.add { room.stateService().updateTopic(state.newTopic ?: "") }
         }
 
         if (state.newHistoryVisibility != null) {
-            operationList.add { room.updateHistoryReadability(state.newHistoryVisibility) }
+            operationList.add { room.stateService().updateHistoryReadability(state.newHistoryVisibility) }
         }
 
         if (state.newRoomJoinRules.hasChanged()) {
-            operationList.add { room.updateJoinRule(state.newRoomJoinRules.newJoinRules, state.newRoomJoinRules.newGuestAccess) }
+            operationList.add { room.stateService().updateJoinRule(state.newRoomJoinRules.newJoinRules, state.newRoomJoinRules.newGuestAccess) }
         }
         viewModelScope.launch {
             updateLoadingState(isLoading = true)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
index 122e0034c6..fe7c984cb4 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
@@ -75,13 +75,13 @@ data class RoomSettingsViewState(
 
     fun getJoinRuleWording(stringProvider: StringProvider): String {
         return when (val joinRule = newRoomJoinRules.newJoinRules ?: currentRoomJoinRules) {
-            RoomJoinRules.INVITE -> {
+            RoomJoinRules.INVITE     -> {
                 stringProvider.getString(R.string.room_settings_room_access_private_title)
             }
-            RoomJoinRules.PUBLIC -> {
+            RoomJoinRules.PUBLIC     -> {
                 stringProvider.getString(R.string.room_settings_room_access_public_title)
             }
-            RoomJoinRules.KNOCK -> {
+            RoomJoinRules.KNOCK      -> {
                 stringProvider.getString(R.string.room_settings_room_access_entry_knock)
             }
             RoomJoinRules.RESTRICTED -> {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilitySharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilitySharedActionViewModel.kt
index c4f4892984..2f1fc086db 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilitySharedActionViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilitySharedActionViewModel.kt
@@ -20,4 +20,4 @@ import im.vector.app.core.platform.VectorSharedActionViewModel
 import javax.inject.Inject
 
 class RoomHistoryVisibilitySharedActionViewModel @Inject constructor() :
-    VectorSharedActionViewModel<RoomHistoryVisibilityRadioAction>()
+        VectorSharedActionViewModel<RoomHistoryVisibilityRadioAction>()
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityViewModel.kt
index 5580156918..e99a8d8a0b 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityViewModel.kt
@@ -19,4 +19,4 @@ package im.vector.app.features.roomprofile.settings.historyvisibility
 import im.vector.app.core.ui.bottomsheet.BottomSheetGenericViewModel
 
 class RoomHistoryVisibilityViewModel(initialState: RoomHistoryVisibilityState) :
-    BottomSheetGenericViewModel<RoomHistoryVisibilityState>(initialState)
+        BottomSheetGenericViewModel<RoomHistoryVisibilityState>(initialState)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleActivity.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleActivity.kt
index 7099d30862..d6e74c546d 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleActivity.kt
@@ -121,7 +121,8 @@ class RoomJoinRuleActivity : VectorBaseActivity<ActivitySimpleBinding>() {
         supportFragmentManager.commitTransaction {
             setCustomAnimations(R.anim.fade_in, R.anim.fade_out, R.anim.fade_in, R.anim.fade_out)
             val tag = RoomJoinRuleChooseRestrictedFragment::class.simpleName
-            replace(views.simpleFragmentContainer.id,
+            replace(
+                    views.simpleFragmentContainer.id,
                     RoomJoinRuleChooseRestrictedFragment::class.java,
                     this@RoomJoinRuleActivity.roomProfileArgs.toMvRxBundle(),
                     tag
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleSharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleSharedActionViewModel.kt
index 971d71e0df..fd1fb4d61e 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleSharedActionViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleSharedActionViewModel.kt
@@ -20,4 +20,4 @@ import im.vector.app.core.platform.VectorSharedActionViewModel
 import javax.inject.Inject
 
 class RoomJoinRuleSharedActionViewModel @Inject constructor() :
-    VectorSharedActionViewModel<RoomJoinRuleRadioAction>()
+        VectorSharedActionViewModel<RoomJoinRuleRadioAction>()
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleViewModel.kt
index 1ff374bf5b..e528c41676 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleViewModel.kt
@@ -19,4 +19,4 @@ package im.vector.app.features.roomprofile.settings.joinrule
 import im.vector.app.core.ui.bottomsheet.BottomSheetGenericViewModel
 
 class RoomJoinRuleViewModel(initialState: RoomJoinRuleState) :
-    BottomSheetGenericViewModel<RoomJoinRuleState>(initialState)
+        BottomSheetGenericViewModel<RoomJoinRuleState>(initialState)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/advanced/RoomJoinRuleChooseRestrictedViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/advanced/RoomJoinRuleChooseRestrictedViewModel.kt
index f1897761b2..87dc0d2da9 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/advanced/RoomJoinRuleChooseRestrictedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/advanced/RoomJoinRuleChooseRestrictedViewModel.kt
@@ -40,7 +40,10 @@ import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
+import org.matrix.android.sdk.api.session.room.getStateEvent
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesContent
@@ -97,11 +100,11 @@ class RoomJoinRuleChooseRestrictedViewModel @AssistedInject constructor(
                 }
             }
 
-            val homeServerCapabilities = session.getHomeServerCapabilities()
+            val homeServerCapabilities = session.homeServerCapabilitiesService().getHomeServerCapabilities()
             var safeRule: RoomJoinRules = joinRulesContent?.joinRules ?: RoomJoinRules.INVITE
             // server is not really checking that, just to be sure let's check
             val restrictedSupportedByThisVersion = homeServerCapabilities
-                    .isFeatureSupported(HomeServerCapabilities.ROOM_CAP_RESTRICTED, room.getRoomVersion())
+                    .isFeatureSupported(HomeServerCapabilities.ROOM_CAP_RESTRICTED, room.roomVersionService().getRoomVersion())
             if (safeRule == RoomJoinRules.RESTRICTED &&
                     !restrictedSupportedByThisVersion) {
                 safeRule = RoomJoinRules.INVITE
@@ -189,9 +192,9 @@ class RoomJoinRuleChooseRestrictedViewModel @AssistedInject constructor(
         viewModelScope.launch {
             try {
                 when (state.currentRoomJoinRules) {
-                    RoomJoinRules.PUBLIC     -> room.setJoinRulePublic()
-                    RoomJoinRules.INVITE     -> room.setJoinRuleInviteOnly()
-                    RoomJoinRules.RESTRICTED -> room.setJoinRuleRestricted(state.updatedAllowList.map { it.id })
+                    RoomJoinRules.PUBLIC     -> room.stateService().setJoinRulePublic()
+                    RoomJoinRules.INVITE     -> room.stateService().setJoinRuleInviteOnly()
+                    RoomJoinRules.RESTRICTED -> room.stateService().setJoinRuleRestricted(state.updatedAllowList.map { it.id })
                     RoomJoinRules.KNOCK,
                     RoomJoinRules.PRIVATE,
                     null                     -> {
@@ -292,7 +295,7 @@ class RoomJoinRuleChooseRestrictedViewModel @AssistedInject constructor(
             setState { copy(updatingStatus = Loading()) }
             viewModelScope.launch {
                 try {
-                    room.setJoinRuleRestricted(candidates.map { it.id })
+                    room.stateService().setJoinRuleRestricted(candidates.map { it.id })
                     setState { copy(updatingStatus = Success(Unit)) }
                 } catch (failure: Throwable) {
                     setState { copy(updatingStatus = Fail(failure)) }
@@ -355,7 +358,7 @@ class RoomJoinRuleChooseRestrictedViewModel @AssistedInject constructor(
         viewModelScope.launch {
             if (vectorPreferences.developerMode()) {
                 // in developer mode we let you choose any room or space to restrict to
-                val filteredCandidates = session.getRoomSummaries(
+                val filteredCandidates = session.roomService().getRoomSummaries(
                         roomSummaryQueryParams {
                             excludeType = null
                             displayName = QueryStringValue.Contains(action.filter, QueryStringValue.Case.INSENSITIVE)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt
index 6a115ad272..721f99178f 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt
@@ -30,6 +30,7 @@ import com.google.android.material.tabs.TabLayoutMediator
 import im.vector.app.R
 import im.vector.app.core.intent.getMimeTypeFromUri
 import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.time.Clock
 import im.vector.app.core.utils.saveMedia
 import im.vector.app.core.utils.shareMedia
 import im.vector.app.databinding.FragmentRoomUploadsBinding
@@ -43,7 +44,8 @@ import javax.inject.Inject
 
 class RoomUploadsFragment @Inject constructor(
         private val avatarRenderer: AvatarRenderer,
-        private val notificationUtils: NotificationUtils
+        private val notificationUtils: NotificationUtils,
+        private val clock: Clock,
 ) : VectorBaseFragment<FragmentRoomUploadsBinding>() {
 
     private val roomProfileArgs: RoomProfileArgs by args()
@@ -88,7 +90,8 @@ class RoomUploadsFragment @Inject constructor(
                                     file = it.file,
                                     title = it.title,
                                     mediaMimeType = getMimeTypeFromUri(requireContext(), it.file.toUri()),
-                                    notificationUtils = notificationUtils
+                                    notificationUtils = notificationUtils,
+                                    currentTimeMillis = clock.epochMillis()
                             )
                         }.onFailure { failure ->
                             if (!isAdded) return@onFailure
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
index c9aaca4373..9ea6fd2dc2 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
@@ -28,6 +28,7 @@ import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.model.message.MessageType
 import org.matrix.android.sdk.flow.flow
 import org.matrix.android.sdk.flow.unwrap
@@ -72,7 +73,7 @@ class RoomUploadsViewModel @AssistedInject constructor(
 
         viewModelScope.launch {
             try {
-                val result = room.getUploads(20, token)
+                val result = room.uploadsService().getUploads(20, token)
 
                 token = result.nextToken
 
@@ -116,7 +117,8 @@ class RoomUploadsViewModel @AssistedInject constructor(
         viewModelScope.launch {
             val event = try {
                 val file = session.fileService().downloadFile(
-                        messageContent = action.uploadEvent.contentWithAttachmentContent)
+                        messageContent = action.uploadEvent.contentWithAttachmentContent
+                )
                 RoomUploadsViewEvents.FileReadyForSharing(file)
             } catch (failure: Throwable) {
                 RoomUploadsViewEvents.Failure(failure)
@@ -129,7 +131,8 @@ class RoomUploadsViewModel @AssistedInject constructor(
         viewModelScope.launch {
             val event = try {
                 val file = session.fileService().downloadFile(
-                        messageContent = action.uploadEvent.contentWithAttachmentContent)
+                        messageContent = action.uploadEvent.contentWithAttachmentContent
+                )
                 RoomUploadsViewEvents.FileReadyForSaving(file, action.uploadEvent.contentWithAttachmentContent.body)
             } catch (failure: Throwable) {
                 RoomUploadsViewEvents.Failure(failure)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt
index 4d45c2ccfc..b741b5c652 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt
@@ -68,9 +68,13 @@ class UploadsFileController @Inject constructor(
             uploadsFileItem {
                 id(uploadEvent.eventId)
                 title(uploadEvent.contentWithAttachmentContent.body)
-                subtitle(host.stringProvider.getString(R.string.uploads_files_subtitle,
-                        uploadEvent.senderInfo.disambiguatedDisplayName,
-                        host.dateFormatter.format(uploadEvent.root.originServerTs, DateFormatKind.DEFAULT_DATE_AND_TIME)))
+                subtitle(
+                        host.stringProvider.getString(
+                                R.string.uploads_files_subtitle,
+                                uploadEvent.senderInfo.disambiguatedDisplayName,
+                                host.dateFormatter.format(uploadEvent.root.originServerTs, DateFormatKind.DEFAULT_DATE_AND_TIME)
+                        )
+                )
                 listener(object : UploadsFileItem.Listener {
                     override fun onItemClicked() {
                         host.listener?.onOpenClicked(uploadEvent)
diff --git a/vector/src/main/java/im/vector/app/features/session/SessionScopedProperty.kt b/vector/src/main/java/im/vector/app/features/session/SessionScopedProperty.kt
index e6a84a41d8..64d49800c8 100644
--- a/vector/src/main/java/im/vector/app/features/session/SessionScopedProperty.kt
+++ b/vector/src/main/java/im/vector/app/features/session/SessionScopedProperty.kt
@@ -23,9 +23,9 @@ import kotlin.reflect.KProperty
  * This is a simple hack for having some Session scope dependencies.
  * Probably a temporary solution waiting for refactoring the Dagger management of Session.
  * You should use it with an extension property :
-    val Session.myProperty: MyProperty by SessionScopedProperty {
-        init code
-    }
+val Session.myProperty: MyProperty by SessionScopedProperty {
+init code
+}
  *
  */
 class SessionScopedProperty<T : Any>(val initializer: (Session) -> T) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/SecretsSynchronisationInfo.kt b/vector/src/main/java/im/vector/app/features/settings/SecretsSynchronisationInfo.kt
index e21366db02..d667a4f589 100644
--- a/vector/src/main/java/im/vector/app/features/settings/SecretsSynchronisationInfo.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/SecretsSynchronisationInfo.kt
@@ -45,7 +45,7 @@ fun Session.liveSecretSynchronisationInfo(): Flow<SecretsSynchronisationInfo> {
             sessionFlow.liveCrossSigningPrivateKeys()
     ) { _, crossSigningInfo, pInfo ->
         // first check if 4S is already setup
-        val is4SSetup = sharedSecretStorageService.isRecoverySetup()
+        val is4SSetup = sharedSecretStorageService().isRecoverySetup()
         val isCrossSigningEnabled = crossSigningInfo.getOrNull() != null
         val isCrossSigningTrusted = crossSigningInfo.getOrNull()?.isTrusted() == true
         val allPrivateKeysKnown = pInfo.getOrNull()?.allKnown().orFalse()
@@ -63,7 +63,7 @@ fun Session.liveSecretSynchronisationInfo(): Flow<SecretsSynchronisationInfo> {
                 allPrivateKeysKnown = allPrivateKeysKnown,
                 megolmBackupAvailable = megolmBackupAvailable,
                 megolmSecretKnown = megolmKeyKnown,
-                isMegolmKeyIn4S = sharedSecretStorageService.isMegolmKeyInBackup()
+                isMegolmKeyIn4S = sharedSecretStorageService().isMegolmKeyInBackup()
         )
     }
             .distinctUntilChanged()
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt b/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
index f558ba28c6..1c67b86493 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
@@ -62,7 +62,8 @@ object VectorLocale {
         val preferences = DefaultSharedPreferences.getInstance(context)
 
         if (preferences.contains(APPLICATION_LOCALE_LANGUAGE_KEY)) {
-            applicationLocale = Locale(preferences.getString(APPLICATION_LOCALE_LANGUAGE_KEY, "")!!,
+            applicationLocale = Locale(
+                    preferences.getString(APPLICATION_LOCALE_LANGUAGE_KEY, "")!!,
                     preferences.getString(APPLICATION_LOCALE_COUNTRY_KEY, "")!!,
                     preferences.getString(APPLICATION_LOCALE_VARIANT_KEY, "")!!
             )
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index 195072465b..ca42a07d50 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -26,6 +26,7 @@ import com.squareup.seismic.ShakeDetector
 import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.di.DefaultSharedPreferences
+import im.vector.app.core.time.Clock
 import im.vector.app.features.disclaimer.SHARED_PREF_KEY
 import im.vector.app.features.homeserver.ServerUrlsRepository
 import im.vector.app.features.themes.ThemeUtils
@@ -33,7 +34,10 @@ import org.matrix.android.sdk.api.extensions.tryOrNull
 import timber.log.Timber
 import javax.inject.Inject
 
-class VectorPreferences @Inject constructor(private val context: Context) {
+class VectorPreferences @Inject constructor(
+        private val context: Context,
+        private val clock: Clock,
+) {
 
     companion object {
         const val SETTINGS_HELP_PREFERENCE_KEY = "SETTINGS_HELP_PREFERENCE_KEY"
@@ -664,9 +668,9 @@ class VectorPreferences @Inject constructor(private val context: Context) {
      */
     fun getMinMediasLastAccessTime(): Long {
         return when (getSelectedMediasSavingPeriod()) {
-            MEDIA_SAVING_3_DAYS  -> System.currentTimeMillis() / 1000 - 3 * 24 * 60 * 60
-            MEDIA_SAVING_1_WEEK  -> System.currentTimeMillis() / 1000 - 7 * 24 * 60 * 60
-            MEDIA_SAVING_1_MONTH -> System.currentTimeMillis() / 1000 - 30 * 24 * 60 * 60
+            MEDIA_SAVING_3_DAYS  -> clock.epochMillis() / 1000 - 3 * 24 * 60 * 60
+            MEDIA_SAVING_1_WEEK  -> clock.epochMillis() / 1000 - 7 * 24 * 60 * 60
+            MEDIA_SAVING_1_MONTH -> clock.epochMillis() / 1000 - 30 * 24 * 60 * 60
             MEDIA_SAVING_FOREVER -> 0
             else                 -> 0
         }
@@ -872,8 +876,10 @@ class VectorPreferences @Inject constructor(private val context: Context) {
      * @return true if user should always appear offline
      */
     fun userAlwaysAppearsOffline(): Boolean {
-        return defaultPrefs.getBoolean(SETTINGS_PRESENCE_USER_ALWAYS_APPEARS_OFFLINE,
-                getDefault(R.bool.settings_presence_user_always_appears_offline_default))
+        return defaultPrefs.getBoolean(
+                SETTINGS_PRESENCE_USER_ALWAYS_APPEARS_OFFLINE,
+                getDefault(R.bool.settings_presence_user_always_appears_offline_default)
+        )
     }
 
     /**
@@ -1005,9 +1011,11 @@ class VectorPreferences @Inject constructor(private val context: Context) {
     }
 
     fun prefSpacesShowAllRoomInHome(): Boolean {
-        return defaultPrefs.getBoolean(SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME,
+        return defaultPrefs.getBoolean(
+                SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME,
                 // migration of old property
-                !labsSpacesOnlyOrphansInHome())
+                !labsSpacesOnlyOrphansInHome()
+        )
     }
 
     /*
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
index 725c4ceabc..dddda261cd 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
@@ -77,10 +77,12 @@ class VectorSettingsActivity : VectorBaseActivity<ActivityVectorSettingsBinding>
                 SettingsActivityPayload.SecurityPrivacy               ->
                     replaceFragment(views.vectorSettingsPage, VectorSettingsSecurityPrivacyFragment::class.java, null, FRAGMENT_TAG)
                 SettingsActivityPayload.SecurityPrivacyManageSessions ->
-                    replaceFragment(views.vectorSettingsPage,
+                    replaceFragment(
+                            views.vectorSettingsPage,
                             VectorSettingsDevicesFragment::class.java,
                             null,
-                            FRAGMENT_TAG)
+                            FRAGMENT_TAG
+                    )
                 SettingsActivityPayload.Notifications                 -> {
                     requestHighlightPreferenceKeyOnResume(VectorPreferences.SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY)
                     replaceFragment(views.vectorSettingsPage, VectorSettingsNotificationPreferenceFragment::class.java, null, FRAGMENT_TAG)
@@ -161,7 +163,8 @@ class VectorSettingsActivity : VectorBaseActivity<ActivityVectorSettingsBinding>
     }
 
     companion object {
-        fun getIntent(context: Context, directAccess: Int) = Companion.getIntent(context, when (directAccess) {
+        fun getIntent(context: Context, directAccess: Int) = Companion.getIntent(
+                context, when (directAccess) {
             EXTRA_DIRECT_ACCESS_ROOT                             -> SettingsActivityPayload.Root
             EXTRA_DIRECT_ACCESS_ADVANCED_SETTINGS                -> SettingsActivityPayload.AdvancedSettings
             EXTRA_DIRECT_ACCESS_SECURITY_PRIVACY                 -> SettingsActivityPayload.SecurityPrivacy
@@ -173,7 +176,8 @@ class VectorSettingsActivity : VectorBaseActivity<ActivityVectorSettingsBinding>
                 Timber.w("Unknown directAccess: $directAccess defaulting to Root")
                 SettingsActivityPayload.Root
             }
-        })
+        }
+        )
 
         fun getIntent(context: Context, payload: SettingsActivityPayload) = Intent(context, VectorSettingsActivity::class.java)
                 .applyPayload(payload)
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
index 7060bd67fd..99acea79df 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
@@ -45,6 +45,7 @@ import im.vector.app.core.preference.UserAvatarPreference
 import im.vector.app.core.preference.VectorPreference
 import im.vector.app.core.preference.VectorSwitchPreference
 import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.time.Clock
 import im.vector.app.core.utils.TextUtils
 import im.vector.app.core.utils.getSizeOfFiles
 import im.vector.app.core.utils.toast
@@ -64,6 +65,7 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.failure.isInvalidPassword
+import org.matrix.android.sdk.api.session.getUser
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerConfig
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
 import org.matrix.android.sdk.flow.flow
@@ -73,7 +75,8 @@ import java.util.UUID
 import javax.inject.Inject
 
 class VectorSettingsGeneralFragment @Inject constructor(
-        colorProvider: ColorProvider
+        colorProvider: ColorProvider,
+        clock: Clock,
 ) :
         VectorSettingsBaseFragment(),
         GalleryOrCameraDialogHelper.Listener {
@@ -81,7 +84,7 @@ class VectorSettingsGeneralFragment @Inject constructor(
     override var titleRes = R.string.settings_general_title
     override val preferenceXmlRes = R.xml.vector_settings_general
 
-    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider)
+    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider, clock)
 
     private val mUserSettingsCategory by lazy {
         findPreference<PreferenceCategory>(VectorPreferences.SETTINGS_USER_SETTINGS_PREFERENCE_KEY)!!
@@ -177,7 +180,7 @@ class VectorSettingsGeneralFragment @Inject constructor(
 
         // Password
         // Hide the preference if password can not be updated
-        if (session.getHomeServerCapabilities().canChangePassword) {
+        if (session.homeServerCapabilitiesService().getHomeServerCapabilities().canChangePassword) {
             mPasswordPreference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
                 onPasswordUpdateClick()
                 false
@@ -332,7 +335,7 @@ class VectorSettingsGeneralFragment @Inject constructor(
 
         lifecycleScope.launch {
             val result = runCatching {
-                session.updateAvatar(session.myUserId, uri, getFilenameFromUri(context, uri) ?: UUID.randomUUID().toString())
+                session.profileService().updateAvatar(session.myUserId, uri, getFilenameFromUri(context, uri) ?: UUID.randomUUID().toString())
             }
             if (!isAdded) return@launch
 
@@ -444,7 +447,7 @@ class VectorSettingsGeneralFragment @Inject constructor(
                     showPasswordLoadingView(true)
                     lifecycleScope.launch {
                         val result = runCatching {
-                            session.changePassword(oldPwd, newPwd)
+                            session.accountService().changePassword(oldPwd, newPwd)
                         }
                         if (!isAdded) {
                             return@launch
@@ -476,7 +479,7 @@ class VectorSettingsGeneralFragment @Inject constructor(
             displayLoadingView()
 
             lifecycleScope.launch {
-                val result = runCatching { session.setDisplayName(session.myUserId, value) }
+                val result = runCatching { session.profileService().setDisplayName(session.myUserId, value) }
                 if (!isAdded) return@launch
                 result.fold(
                         onSuccess = {
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
index 0ef8e51429..e1e155865a 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
@@ -17,18 +17,23 @@
 package im.vector.app.features.settings
 
 import android.os.Bundle
+import android.text.method.LinkMovementMethod
+import android.widget.TextView
 import androidx.preference.Preference
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import im.vector.app.R
 import im.vector.app.core.preference.VectorSwitchPreference
 import im.vector.app.features.MainActivity
 import im.vector.app.features.MainActivityArgs
 import im.vector.app.features.analytics.plan.MobileScreen
+import im.vector.app.features.home.room.threads.ThreadsManager
 import org.matrix.android.sdk.api.settings.LightweightSettingsStorage
 import javax.inject.Inject
 
 class VectorSettingsLabsFragment @Inject constructor(
         private val vectorPreferences: VectorPreferences,
-        private val lightweightSettingsStorage: LightweightSettingsStorage
+        private val lightweightSettingsStorage: LightweightSettingsStorage,
+        private val threadsManager: ThreadsManager
 ) : VectorSettingsBaseFragment() {
 
     override var titleRes = R.string.room_settings_labs_pref_title
@@ -46,15 +51,51 @@ class VectorSettingsLabsFragment @Inject constructor(
         }
 
         // clear cache
-        findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_LABS_ENABLE_THREAD_MESSAGES)?.let {
-            it.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                // We should migrate threads only if threads are disabled
-                vectorPreferences.setShouldMigrateThreads(!vectorPreferences.areThreadMessagesEnabled())
-                lightweightSettingsStorage.setThreadMessagesEnabled(vectorPreferences.areThreadMessagesEnabled())
-                displayLoadingView()
-                MainActivity.restartApp(requireActivity(), MainActivityArgs(clearCache = true))
+        findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_LABS_ENABLE_THREAD_MESSAGES)?.let { vectorPref ->
+            vectorPref.onPreferenceClickListener = Preference.OnPreferenceClickListener {
+                onThreadsPreferenceClickedInterceptor(vectorPref)
                 false
             }
         }
     }
+
+    /**
+     * Intercept the click to display a user friendly dialog when their homeserver do not support threads
+     */
+    private fun onThreadsPreferenceClickedInterceptor(vectorSwitchPreference: VectorSwitchPreference) {
+        val userEnabledThreads = vectorPreferences.areThreadMessagesEnabled()
+        if (!session.homeServerCapabilitiesService().getHomeServerCapabilities().canUseThreading && userEnabledThreads) {
+            activity?.let {
+                MaterialAlertDialogBuilder(it)
+                        .setTitle(R.string.threads_labs_enable_notice_title)
+                        .setMessage(threadsManager.getLabsEnableThreadsMessage())
+                        .setCancelable(true)
+                        .setNegativeButton(R.string.action_not_now) { _, _ ->
+                            vectorSwitchPreference.isChecked = false
+                        }
+                        .setPositiveButton(R.string.action_try_it_out) { _, _ ->
+                            onThreadsPreferenceClicked()
+                        }
+                        .show()
+                        ?.findViewById<TextView>(android.R.id.message)
+                        ?.apply {
+                            linksClickable = true
+                            movementMethod = LinkMovementMethod.getInstance()
+                        }
+            }
+        } else {
+            onThreadsPreferenceClicked()
+        }
+    }
+
+    /**
+     * Action when threads preference switch is actually clicked
+     */
+    private fun onThreadsPreferenceClicked() {
+        // We should migrate threads only if threads are disabled
+        vectorPreferences.setShouldMigrateThreads(!vectorPreferences.areThreadMessagesEnabled())
+        lightweightSettingsStorage.setThreadMessagesEnabled(vectorPreferences.areThreadMessagesEnabled())
+        displayLoadingView()
+        MainActivity.restartApp(requireActivity(), MainActivityArgs(clearCache = true))
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
index 155234a172..5033400425 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
@@ -86,7 +86,7 @@ class VectorSettingsPreferencesFragment @Inject constructor(
             pref.setOnPreferenceChangeListener { _, newValue ->
                 val presenceOfflineModeEnabled = newValue as? Boolean ?: false
                 lifecycleScope.launch {
-                    session.setMyPresence(if (presenceOfflineModeEnabled) PresenceEnum.OFFLINE else PresenceEnum.ONLINE)
+                    session.presenceService().setMyPresence(if (presenceOfflineModeEnabled) PresenceEnum.OFFLINE else PresenceEnum.ONLINE)
                 }
                 true
             }
@@ -147,8 +147,10 @@ class VectorSettingsPreferencesFragment @Inject constructor(
             it.onPreferenceClickListener = Preference.OnPreferenceClickListener {
                 context?.let { context: Context ->
                     MaterialAlertDialogBuilder(context)
-                            .setSingleChoiceItems(R.array.media_saving_choice,
-                                    vectorPreferences.getSelectedMediasSavingPeriod()) { d, n ->
+                            .setSingleChoiceItems(
+                                    R.array.media_saving_choice,
+                                    vectorPreferences.getSelectedMediasSavingPeriod()
+                            ) { d, n ->
                                 vectorPreferences.setSelectedMediasSavingPeriod(n)
                                 d.cancel()
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
index 1581bb4676..bd4f556461 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
@@ -186,6 +186,10 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
     private val secureBackupPreference by lazy {
         findPreference<VectorPreference>("SETTINGS_SECURE_BACKUP_RECOVERY_PREFERENCE_KEY")!!
     }
+
+    private val ignoredUsersPreference by lazy {
+        findPreference<VectorPreference>("SETTINGS_IGNORED_USERS_PREFERENCE_KEY")!!
+    }
 //    private val secureBackupResetPreference by lazy {
 //        findPreference<VectorPreference>(VectorPreferences.SETTINGS_SECURE_BACKUP_RESET_PREFERENCE_KEY)
 //    }
@@ -271,8 +275,17 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
         refreshXSigningStatus()
 
         secureBackupPreference.icon = activity?.let {
-            ThemeUtils.tintDrawable(it,
-                    ContextCompat.getDrawable(it, R.drawable.ic_secure_backup)!!, R.attr.vctr_content_primary)
+            ThemeUtils.tintDrawable(
+                    it,
+                    ContextCompat.getDrawable(it, R.drawable.ic_secure_backup)!!, R.attr.vctr_content_primary
+            )
+        }
+
+        ignoredUsersPreference.icon = activity?.let {
+            ThemeUtils.tintDrawable(
+                    it,
+                    ContextCompat.getDrawable(it, R.drawable.ic_settings_root_ignored_users)!!, R.attr.vctr_content_primary
+            )
         }
 
         findPreference<VectorPreference>(VectorPreferences.SETTINGS_CRYPTOGRAPHY_HS_ADMIN_DISABLED_E2E_DEFAULT)?.let {
@@ -389,7 +402,8 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
                 navigator.openPinCode(
                         requireContext(),
                         pinActivityResultLauncher,
-                        PinMode.AUTH)
+                        PinMode.AUTH
+                )
             } else {
                 doOpenPinCodePreferenceScreen()
             }
@@ -503,10 +517,14 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
 
                     if (data != null) {
                         MaterialAlertDialogBuilder(thisActivity)
-                                .setMessage(resources.getQuantityString(R.plurals.encryption_import_room_keys_success,
-                                        data.successfullyNumberOfImportedKeys,
-                                        data.successfullyNumberOfImportedKeys,
-                                        data.totalNumberOfKeys))
+                                .setMessage(
+                                        resources.getQuantityString(
+                                                R.plurals.encryption_import_room_keys_success,
+                                                data.successfullyNumberOfImportedKeys,
+                                                data.successfullyNumberOfImportedKeys,
+                                                data.totalNumberOfKeys
+                                        )
+                                )
                                 .setPositiveButton(R.string.ok) { dialog, _ -> dialog.dismiss() }
                                 .show()
                     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt
index 4397da00c4..56c1fccb06 100644
--- a/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt
@@ -34,6 +34,7 @@ import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.auth.ReAuthActivity
 import im.vector.app.features.settings.VectorSettingsActivity
 import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
+import org.matrix.android.sdk.api.session.uia.exceptions.UiaCancelledException
 import javax.inject.Inject
 
 class DeactivateAccountFragment @Inject constructor() : VectorBaseFragment<FragmentDeactivateAccountBinding>() {
@@ -94,8 +95,10 @@ class DeactivateAccountFragment @Inject constructor() : VectorBaseFragment<Fragm
 
     private fun setupViewListeners() {
         views.deactivateAccountSubmit.debouncedClicks {
-            viewModel.handle(DeactivateAccountAction.DeactivateAccount(
-                    views.deactivateAccountEraseCheckbox.isChecked)
+            viewModel.handle(
+                    DeactivateAccountAction.DeactivateAccount(
+                            views.deactivateAccountEraseCheckbox.isChecked
+                    )
             )
         }
     }
@@ -114,16 +117,20 @@ class DeactivateAccountFragment @Inject constructor() : VectorBaseFragment<Fragm
                 is DeactivateAccountViewEvents.OtherFailure  -> {
                     settingsActivity?.ignoreInvalidTokenError = false
                     dismissLoadingDialog()
-                    displayErrorDialog(it.throwable)
+                    if (it.throwable !is UiaCancelledException) {
+                        displayErrorDialog(it.throwable)
+                    }
                 }
                 DeactivateAccountViewEvents.Done             -> {
                     MainActivity.restartApp(requireActivity(), MainActivityArgs(clearCredentials = true, isAccountDeactivated = true))
                 }
                 is DeactivateAccountViewEvents.RequestReAuth -> {
-                    ReAuthActivity.newIntent(requireContext(),
+                    ReAuthActivity.newIntent(
+                            requireContext(),
                             it.registrationFlowResponse,
                             it.lastErrorCode,
-                            getString(R.string.deactivate_account_title)).let { intent ->
+                            getString(R.string.deactivate_account_title)
+                    ).let { intent ->
                         reAuthActivityResultLauncher.launch(intent)
                     }
                 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
index 95537a8700..ad73854060 100644
--- a/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
@@ -32,6 +32,7 @@ import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
 import org.matrix.android.sdk.api.failure.isInvalidUIAAuth
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.uia.DefaultBaseAuth
+import org.matrix.android.sdk.api.session.uia.exceptions.UiaCancelledException
 import org.matrix.android.sdk.api.util.fromBase64
 import timber.log.Timber
 import kotlin.coroutines.Continuation
@@ -44,7 +45,7 @@ data class DeactivateAccountViewState(
 
 class DeactivateAccountViewModel @AssistedInject constructor(@Assisted private val initialState: DeactivateAccountViewState,
                                                              private val session: Session) :
-    VectorViewModel<DeactivateAccountViewState, DeactivateAccountAction, DeactivateAccountViewEvents>(initialState) {
+        VectorViewModel<DeactivateAccountViewState, DeactivateAccountAction, DeactivateAccountViewEvents>(initialState) {
 
     @AssistedFactory
     interface Factory : MavericksAssistedViewModelFactory<DeactivateAccountViewModel, DeactivateAccountViewState> {
@@ -57,16 +58,19 @@ class DeactivateAccountViewModel @AssistedInject constructor(@Assisted private v
     override fun handle(action: DeactivateAccountAction) {
         when (action) {
             is DeactivateAccountAction.DeactivateAccount -> handleDeactivateAccount(action)
-            DeactivateAccountAction.SsoAuthDone -> {
+            DeactivateAccountAction.SsoAuthDone          -> {
                 Timber.d("## UIA - FallBack success")
+                _viewEvents.post(DeactivateAccountViewEvents.Loading())
                 if (pendingAuth != null) {
                     uiaContinuation?.resume(pendingAuth!!)
                 } else {
                     uiaContinuation?.resumeWithException(IllegalArgumentException())
                 }
             }
-            is DeactivateAccountAction.PasswordAuthDone -> {
-                val decryptedPass = session.loadSecureSecret<String>(action.password.fromBase64().inputStream(), ReAuthActivity.DEFAULT_RESULT_KEYSTORE_ALIAS)
+            is DeactivateAccountAction.PasswordAuthDone  -> {
+                _viewEvents.post(DeactivateAccountViewEvents.Loading())
+                val decryptedPass = session.secureStorageService()
+                        .loadSecureSecret<String>(action.password.fromBase64().inputStream(), ReAuthActivity.DEFAULT_RESULT_KEYSTORE_ALIAS)
                 uiaContinuation?.resume(
                         UserPasswordAuth(
                                 session = pendingAuth?.session,
@@ -75,9 +79,9 @@ class DeactivateAccountViewModel @AssistedInject constructor(@Assisted private v
                         )
                 )
             }
-            DeactivateAccountAction.ReAuthCancelled -> {
+            DeactivateAccountAction.ReAuthCancelled      -> {
                 Timber.d("## UIA - Reauth cancelled")
-                uiaContinuation?.resumeWithException(Exception())
+                uiaContinuation?.resumeWithException(UiaCancelledException())
                 uiaContinuation = null
                 pendingAuth = null
             }
@@ -89,7 +93,7 @@ class DeactivateAccountViewModel @AssistedInject constructor(@Assisted private v
 
         viewModelScope.launch {
             val event = try {
-                session.deactivateAccount(
+                session.accountService().deactivateAccount(
                         action.eraseAllData,
                         object : UserInteractiveAuthInterceptor {
                             override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
@@ -100,7 +104,7 @@ class DeactivateAccountViewModel @AssistedInject constructor(@Assisted private v
                         }
                 )
                 DeactivateAccountViewEvents.Done
-            } catch (failure: Exception) {
+            } catch (failure: Throwable) {
                 if (failure.isInvalidUIAAuth()) {
                     DeactivateAccountViewEvents.InvalidAuth
                 } else {
diff --git a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt
index 51ab422935..6df92a0e5c 100644
--- a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt
@@ -85,10 +85,12 @@ class CrossSigningSettingsFragment @Inject constructor(
                     Unit
                 }
                 is CrossSigningSettingsViewEvents.RequestReAuth        -> {
-                    ReAuthActivity.newIntent(requireContext(),
+                    ReAuthActivity.newIntent(
+                            requireContext(),
                             event.registrationFlowResponse,
                             event.lastErrorCode,
-                            getString(R.string.initialize_cross_signing)).let { intent ->
+                            getString(R.string.initialize_cross_signing)
+                    ).let { intent ->
                         reAuthActivityResultLauncher.launch(intent)
                     }
                 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt
index 0d4c39a230..c81064c8d9 100644
--- a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt
@@ -110,7 +110,8 @@ class CrossSigningSettingsViewModel @AssistedInject constructor(
                                                 uiaContinuation = promise
                                             }
                                         }
-                                    }, it)
+                                    }, it
+                            )
                         }
                     } catch (failure: Throwable) {
                         handleInitializeXSigningError(failure)
@@ -129,7 +130,8 @@ class CrossSigningSettingsViewModel @AssistedInject constructor(
                 }
             }
             is CrossSigningSettingsAction.PasswordAuthDone    -> {
-                val decryptedPass = session.loadSecureSecret<String>(action.password.fromBase64().inputStream(), ReAuthActivity.DEFAULT_RESULT_KEYSTORE_ALIAS)
+                val decryptedPass = session.secureStorageService()
+                        .loadSecureSecret<String>(action.password.fromBase64().inputStream(), ReAuthActivity.DEFAULT_RESULT_KEYSTORE_ALIAS)
                 uiaContinuation?.resume(
                         UserPasswordAuth(
                                 session = pendingAuth?.session,
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
index 8f04534440..648e9b3261 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
@@ -99,9 +99,10 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
                     style(ItemStyle.BIG_TEXT)
                     titleIconResourceId(shield)
                     title(host.stringProvider.getString(R.string.crosssigning_verify_this_session).toEpoxyCharSequence())
-                    description(host.stringProvider
-                            .getString(if (data.hasOtherSessions) R.string.confirm_your_identity else R.string.confirm_your_identity_quad_s)
-                            .toEpoxyCharSequence()
+                    description(
+                            host.stringProvider
+                                    .getString(if (data.hasOtherSessions) R.string.confirm_your_identity else R.string.confirm_your_identity_quad_s)
+                                    .toEpoxyCharSequence()
                     )
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
index 2573a2f395..b24b8475a5 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt
@@ -48,7 +48,7 @@ class DeviceVerificationInfoBottomSheetViewModel @AssistedInject constructor(@As
             copy(
                     hasAccountCrossSigning = session.cryptoService().crossSigningService().isCrossSigningInitialized(),
                     accountCrossSigningIsTrusted = session.cryptoService().crossSigningService().isCrossSigningVerified(),
-                    isRecoverySetup = session.sharedSecretStorageService.isRecoverySetup()
+                    isRecoverySetup = session.sharedSecretStorageService().isRecoverySetup()
             )
         }
         session.flow().liveCrossSigningInfo(session.myUserId)
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesAction.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesAction.kt
index dd8fca3820..8ee0e7636e 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesAction.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesAction.kt
@@ -23,7 +23,7 @@ sealed class DevicesAction : VectorViewModelAction {
     object Refresh : DevicesAction()
     data class Delete(val deviceId: String) : DevicesAction()
 
-//    data class Password(val password: String) : DevicesAction()
+    //    data class Password(val password: String) : DevicesAction()
     data class Rename(val deviceId: String, val newName: String) : DevicesAction()
 
     data class PromptRename(val deviceId: String) : DevicesAction()
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewEvents.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewEvents.kt
index 941b33a8ef..8ba7dbc871 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewEvents.kt
@@ -29,7 +29,7 @@ import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
 sealed class DevicesViewEvents : VectorViewEvents {
     data class Loading(val message: CharSequence? = null) : DevicesViewEvents()
 
-//    object HideLoading : DevicesViewEvents()
+    //    object HideLoading : DevicesViewEvents()
     data class Failure(val throwable: Throwable) : DevicesViewEvents()
 
 //    object RequestPassword : DevicesViewEvents()
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
index 46a2ba03b1..e56e08d19e 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
@@ -219,7 +219,8 @@ class DevicesViewModel @AssistedInject constructor(
                 Unit
             }
             is DevicesAction.PasswordAuthDone       -> {
-                val decryptedPass = session.loadSecureSecret<String>(action.password.fromBase64().inputStream(), ReAuthActivity.DEFAULT_RESULT_KEYSTORE_ALIAS)
+                val decryptedPass = session.secureStorageService()
+                        .loadSecureSecret<String>(action.password.fromBase64().inputStream(), ReAuthActivity.DEFAULT_RESULT_KEYSTORE_ALIAS)
                 uiaContinuation?.resume(
                         UserPasswordAuth(
                                 session = pendingAuth?.session,
@@ -243,10 +244,12 @@ class DevicesViewModel @AssistedInject constructor(
         val txID = session.cryptoService()
                 .verificationService()
                 .beginKeyVerification(VerificationMethod.SAS, session.myUserId, action.deviceId, null)
-        _viewEvents.post(DevicesViewEvents.ShowVerifyDevice(
-                session.myUserId,
-                txID
-        ))
+        _viewEvents.post(
+                DevicesViewEvents.ShowVerifyDevice(
+                        session.myUserId,
+                        txID
+                )
+        )
     }
 
     private fun handleShowDeviceCryptoInfo(action: DevicesAction.VerifyMyDeviceManually) = withState { state ->
@@ -273,7 +276,8 @@ class DevicesViewModel @AssistedInject constructor(
                 session.cryptoService().setDeviceVerification(
                         DeviceTrustLevel(crossSigningVerified = false, locallyVerified = true),
                         action.cryptoDeviceInfo.userId,
-                        action.cryptoDeviceInfo.deviceId)
+                        action.cryptoDeviceInfo.deviceId
+                )
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt
index e897cdccac..6e6556caaa 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt
@@ -162,10 +162,12 @@ class VectorSettingsDevicesFragment @Inject constructor(
      * Launch the re auth activity to get credentials
      */
     private fun askForReAuthentication(reAuthReq: DevicesViewEvents.RequestReAuth) {
-        ReAuthActivity.newIntent(requireContext(),
+        ReAuthActivity.newIntent(
+                requireContext(),
                 reAuthReq.registrationFlowResponse,
                 reAuthReq.lastErrorCode,
-                getString(R.string.devices_delete_dialog_title)).let { intent ->
+                getString(R.string.devices_delete_dialog_title)
+        ).let { intent ->
             reAuthActivityResultLauncher.launch(intent)
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt
index 9576b84e98..72085d37fd 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt
@@ -38,7 +38,7 @@ data class AccountDataViewState(
 
 class AccountDataViewModel @AssistedInject constructor(@Assisted initialState: AccountDataViewState,
                                                        private val session: Session) :
-    VectorViewModel<AccountDataViewState, AccountDataAction, EmptyViewEvents>(initialState) {
+        VectorViewModel<AccountDataViewState, AccountDataAction, EmptyViewEvents>(initialState) {
 
     init {
         session.flow().liveUserAccountData(emptySet())
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt
index dde032d303..30c2757eff 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt
@@ -40,7 +40,7 @@ data class GossipingEventsPaperTrailState(
 
 class GossipingEventsPaperTrailViewModel @AssistedInject constructor(@Assisted initialState: GossipingEventsPaperTrailState,
                                                                      private val session: Session) :
-    VectorViewModel<GossipingEventsPaperTrailState, EmptyAction, EmptyViewEvents>(initialState) {
+        VectorViewModel<GossipingEventsPaperTrailState, EmptyAction, EmptyViewEvents>(initialState) {
 
     init {
         refresh()
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestViewModel.kt
index fd1cd3480d..f2df0e4211 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestViewModel.kt
@@ -51,7 +51,7 @@ data class KeyRequestViewState(
 class KeyRequestViewModel @AssistedInject constructor(
         @Assisted initialState: KeyRequestViewState,
         private val session: Session) :
-    VectorViewModel<KeyRequestViewState, KeyRequestAction, KeyRequestEvents>(initialState) {
+        VectorViewModel<KeyRequestViewState, KeyRequestAction, KeyRequestEvents>(initialState) {
 
     @AssistedFactory
     interface Factory : MavericksAssistedViewModelFactory<KeyRequestViewModel, KeyRequestViewState> {
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestsFragment.kt
index cef68c01c1..4225cbdbec 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestsFragment.kt
@@ -36,12 +36,15 @@ import im.vector.app.R
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.safeOpenOutputStream
 import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.time.Clock
 import im.vector.app.core.utils.selectTxtFileToWrite
 import im.vector.app.databinding.FragmentDevtoolKeyrequestsBinding
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import javax.inject.Inject
 
-class KeyRequestsFragment @Inject constructor() : VectorBaseFragment<FragmentDevtoolKeyrequestsBinding>() {
+class KeyRequestsFragment @Inject constructor(
+        private val clock: Clock,
+) : VectorBaseFragment<FragmentDevtoolKeyrequestsBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentDevtoolKeyrequestsBinding {
         return FragmentDevtoolKeyrequestsBinding.inflate(inflater, container, false)
@@ -126,7 +129,7 @@ class KeyRequestsFragment @Inject constructor() : VectorBaseFragment<FragmentDev
             selectTxtFileToWrite(
                     activity = requireActivity(),
                     activityResultLauncher = epxortAuditForActivityResult,
-                    defaultFileName = "audit-export_${System.currentTimeMillis()}.txt",
+                    defaultFileName = "audit-export_${clock.epochMillis()}.txt",
                     chooserHint = "Export Audit"
             )
             return true
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestListFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestListFragment.kt
index 0483d5fb4d..ca1f36dbb2 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestListFragment.kt
@@ -28,6 +28,7 @@ import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentGenericRecyclerBinding
 import javax.inject.Inject
+
 class OutgoingKeyRequestListFragment @Inject constructor(
         private val epoxyController: OutgoingKeyRequestPagedController
 ) : VectorBaseFragment<FragmentGenericRecyclerBinding>() {
diff --git a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsViewModel.kt
index fab563b49e..9e237f818b 100644
--- a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsViewModel.kt
@@ -47,7 +47,7 @@ class HomeserverSettingsViewModel @AssistedInject constructor(
             copy(
                     homeserverUrl = session.sessionParams.homeServerUrl,
                     homeserverClientServerApiUrl = session.sessionParams.homeServerUrlBase,
-                    homeServerCapabilities = session.getHomeServerCapabilities()
+                    homeServerCapabilities = session.homeServerCapabilitiesService().getHomeServerCapabilities()
             )
         }
         fetchHomeserverVersion()
@@ -57,12 +57,12 @@ class HomeserverSettingsViewModel @AssistedInject constructor(
     private fun refreshHomeServerCapabilities() {
         viewModelScope.launch {
             runCatching {
-                session.refreshHomeServerCapabilities()
+                session.homeServerCapabilitiesService().refreshHomeServerCapabilities()
             }
 
             setState {
                 copy(
-                        homeServerCapabilities = session.getHomeServerCapabilities()
+                        homeServerCapabilities = session.homeServerCapabilitiesService().getHomeServerCapabilities()
                 )
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt
index 14f7cd9230..df76d68c17 100644
--- a/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt
@@ -63,7 +63,7 @@ class IgnoredUsersViewModel @AssistedInject constructor(
         setState { copy(isLoading = true) }
         viewModelScope.launch {
             val viewEvent = try {
-                session.unIgnoreUserIds(listOf(action.userId))
+                session.userService().unIgnoreUserIds(listOf(action.userId))
                 IgnoredUsersViewEvents.Success
             } catch (throwable: Throwable) {
                 IgnoredUsersViewEvents.Failure(throwable)
diff --git a/vector/src/main/java/im/vector/app/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt b/vector/src/main/java/im/vector/app/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt
index 66fa690b82..3cb1e29016 100644
--- a/vector/src/main/java/im/vector/app/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt
@@ -30,8 +30,6 @@ import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentGenericRecyclerBinding
-import im.vector.app.features.MainActivity
-import im.vector.app.features.MainActivityArgs
 import im.vector.app.features.analytics.plan.MobileScreen
 import javax.inject.Inject
 
@@ -62,16 +60,11 @@ class VectorSettingsIgnoredUsersFragment @Inject constructor(
             when (it) {
                 is IgnoredUsersViewEvents.Loading -> showLoading(it.message)
                 is IgnoredUsersViewEvents.Failure -> showFailure(it.throwable)
-                IgnoredUsersViewEvents.Success    -> handleSuccess()
+                IgnoredUsersViewEvents.Success    -> Unit
             }
         }
     }
 
-    private fun handleSuccess() {
-        // A user has been un-ignored, perform a initial sync
-        MainActivity.restartApp(requireActivity(), MainActivityArgs(clearCache = true))
-    }
-
     override fun onDestroyView() {
         ignoredUsersController.callback = null
         views.genericRecyclerView.cleanup()
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/NotificationIndex.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/NotificationIndex.kt
index 793b94db1d..a768e443bb 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/NotificationIndex.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/NotificationIndex.kt
@@ -16,8 +16,8 @@
 
 package im.vector.app.features.settings.notifications
 
-import org.matrix.android.sdk.api.pushrules.rest.PushRule
-import org.matrix.android.sdk.api.pushrules.toJson
+import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.session.pushrules.toJson
 
 enum class NotificationIndex {
     OFF,
@@ -29,15 +29,16 @@ enum class NotificationIndex {
  * Given a push rule determine the NotificationIndex by comparing it to the static push rule definitions.
  * Used when determining the selected state of the PushRulePreference.
  */
-val PushRule.notificationIndex: NotificationIndex? get() =
-    NotificationIndex.values().firstOrNull {
-        // Get the actions for the index
-        val standardAction = getStandardAction(this.ruleId, it) ?: return@firstOrNull false
-        val indexActions = standardAction.actions ?: listOf()
-        // Check if the input rule matches a rule generated from the static rule definitions
-        val targetRule = this.copy(enabled = standardAction != StandardActions.Disabled, actions = indexActions.toJson())
-        ruleMatches(this, targetRule)
-    }
+val PushRule.notificationIndex: NotificationIndex?
+    get() =
+        NotificationIndex.values().firstOrNull {
+            // Get the actions for the index
+            val standardAction = getStandardAction(this.ruleId, it) ?: return@firstOrNull false
+            val indexActions = standardAction.actions ?: listOf()
+            // Check if the input rule matches a rule generated from the static rule definitions
+            val targetRule = this.copy(enabled = standardAction != StandardActions.Disabled, actions = indexActions.toJson())
+            ruleMatches(this, targetRule)
+        }
 
 /**
  * A check to determine if two push rules should be considered a match.
@@ -46,9 +47,9 @@ private fun ruleMatches(rule: PushRule, targetRule: PushRule): Boolean {
     // Rules match if both are disabled, or if both are enabled and their highlight/sound/notify actions match up.
     return (!rule.enabled && !targetRule.enabled) ||
             (rule.enabled &&
-            targetRule.enabled &&
-            rule.getHighlight() == targetRule.getHighlight() &&
-            rule.getNotificationSound() == targetRule.getNotificationSound() &&
-            rule.shouldNotify() == targetRule.shouldNotify() &&
-            rule.shouldNotNotify() == targetRule.shouldNotNotify())
+                    targetRule.enabled &&
+                    rule.getHighlight() == targetRule.getHighlight() &&
+                    rule.getNotificationSound() == targetRule.getNotificationSound() &&
+                    rule.shouldNotify() == targetRule.shouldNotify() &&
+                    rule.shouldNotNotify() == targetRule.shouldNotNotify())
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/PushRuleDefinitions.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/PushRuleDefinitions.kt
index d101d86aa3..1507528bd1 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/PushRuleDefinitions.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/PushRuleDefinitions.kt
@@ -16,7 +16,7 @@
 
 package im.vector.app.features.settings.notifications
 
-import org.matrix.android.sdk.api.pushrules.RuleIds
+import org.matrix.android.sdk.api.session.pushrules.RuleIds
 
 fun getStandardAction(ruleId: String, index: NotificationIndex): StandardActions? {
     return when (ruleId) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/StandardActions.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/StandardActions.kt
index d6b6165bd9..b19b5bcdd6 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/StandardActions.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/StandardActions.kt
@@ -16,7 +16,7 @@
 
 package im.vector.app.features.settings.notifications
 
-import org.matrix.android.sdk.api.pushrules.Action
+import org.matrix.android.sdk.api.session.pushrules.Action
 
 sealed class StandardActions(
         val actions: List<Action>?
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsAdvancedNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsAdvancedNotificationPreferenceFragment.kt
index 3b4aef929d..8eccc8c593 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsAdvancedNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsAdvancedNotificationPreferenceFragment.kt
@@ -23,12 +23,12 @@ import im.vector.app.core.preference.VectorPreference
 import im.vector.app.core.utils.toast
 import im.vector.app.features.settings.VectorSettingsBaseFragment
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.pushrules.RuleIds
-import org.matrix.android.sdk.api.pushrules.rest.PushRuleAndKind
+import org.matrix.android.sdk.api.session.pushrules.RuleIds
+import org.matrix.android.sdk.api.session.pushrules.rest.PushRuleAndKind
 import javax.inject.Inject
 
 class VectorSettingsAdvancedNotificationPreferenceFragment @Inject constructor() :
-    VectorSettingsBaseFragment() {
+        VectorSettingsBaseFragment() {
 
     override var titleRes: Int = R.string.settings_notification_advanced
 
@@ -38,7 +38,7 @@ class VectorSettingsAdvancedNotificationPreferenceFragment @Inject constructor()
         for (preferenceKey in prefKeyToPushRuleId.keys) {
             val preference = findPreference<VectorPreference>(preferenceKey)
             if (preference is PushRulePreference) {
-                val ruleAndKind: PushRuleAndKind? = session.getPushRules().findDefaultRule(prefKeyToPushRuleId[preferenceKey])
+                val ruleAndKind: PushRuleAndKind? = session.pushRuleService().getPushRules().findDefaultRule(prefKeyToPushRuleId[preferenceKey])
 
                 if (ruleAndKind == null) {
                     // The rule is not defined, hide the preference
@@ -57,10 +57,12 @@ class VectorSettingsAdvancedNotificationPreferenceFragment @Inject constructor()
 
                             lifecycleScope.launch {
                                 val result = runCatching {
-                                    session.updatePushRuleActions(ruleAndKind.kind,
+                                    session.pushRuleService().updatePushRuleActions(
+                                            ruleAndKind.kind,
                                             ruleAndKind.pushRule.ruleId,
                                             enabled,
-                                            newActions)
+                                            newActions
+                                    )
                                 }
                                 if (!isAdded) {
                                     return@launch
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsDefaultNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsDefaultNotificationPreferenceFragment.kt
index 2179e0eee2..33ed7730eb 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsDefaultNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsDefaultNotificationPreferenceFragment.kt
@@ -20,21 +20,21 @@ import android.os.Bundle
 import im.vector.app.R
 import im.vector.app.core.preference.VectorPreferenceCategory
 import im.vector.app.features.analytics.plan.MobileScreen
-import org.matrix.android.sdk.api.pushrules.RuleIds
+import org.matrix.android.sdk.api.session.pushrules.RuleIds
 
 class VectorSettingsDefaultNotificationPreferenceFragment :
-    VectorSettingsPushRuleNotificationPreferenceFragment() {
+        VectorSettingsPushRuleNotificationPreferenceFragment() {
 
     override var titleRes: Int = R.string.settings_notification_default
 
     override val preferenceXmlRes = R.xml.vector_settings_notification_default
 
     override val prefKeyToPushRuleId = mapOf(
-                "SETTINGS_PUSH_RULE_MESSAGES_IN_ONE_TO_ONE_PREFERENCE_KEY" to RuleIds.RULE_ID_ONE_TO_ONE_ROOM,
-                "SETTINGS_PUSH_RULE_MESSAGES_IN_GROUP_CHAT_PREFERENCE_KEY" to RuleIds.RULE_ID_ALL_OTHER_MESSAGES_ROOMS,
-                "SETTINGS_PUSH_RULE_MESSAGES_IN_E2E_ONE_ONE_CHAT_PREFERENCE_KEY" to RuleIds.RULE_ID_ONE_TO_ONE_ENCRYPTED_ROOM,
-                "SETTINGS_PUSH_RULE_MESSAGES_IN_E2E_GROUP_CHAT_PREFERENCE_KEY" to RuleIds.RULE_ID_ENCRYPTED
-        )
+            "SETTINGS_PUSH_RULE_MESSAGES_IN_ONE_TO_ONE_PREFERENCE_KEY" to RuleIds.RULE_ID_ONE_TO_ONE_ROOM,
+            "SETTINGS_PUSH_RULE_MESSAGES_IN_GROUP_CHAT_PREFERENCE_KEY" to RuleIds.RULE_ID_ALL_OTHER_MESSAGES_ROOMS,
+            "SETTINGS_PUSH_RULE_MESSAGES_IN_E2E_ONE_ONE_CHAT_PREFERENCE_KEY" to RuleIds.RULE_ID_ONE_TO_ONE_ENCRYPTED_ROOM,
+            "SETTINGS_PUSH_RULE_MESSAGES_IN_E2E_GROUP_CHAT_PREFERENCE_KEY" to RuleIds.RULE_ID_ENCRYPTED
+    )
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsKeywordAndMentionsNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsKeywordAndMentionsNotificationPreferenceFragment.kt
index 731f4b3228..d0a1bff50c 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsKeywordAndMentionsNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsKeywordAndMentionsNotificationPreferenceFragment.kt
@@ -29,10 +29,10 @@ import im.vector.app.features.analytics.plan.MobileScreen
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.matrix.android.sdk.api.pushrules.RuleIds
-import org.matrix.android.sdk.api.pushrules.RuleKind
-import org.matrix.android.sdk.api.pushrules.rest.PushRule
-import org.matrix.android.sdk.api.pushrules.toJson
+import org.matrix.android.sdk.api.session.pushrules.RuleIds
+import org.matrix.android.sdk.api.session.pushrules.RuleKind
+import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.session.pushrules.toJson
 
 class VectorSettingsKeywordAndMentionsNotificationPreferenceFragment :
         VectorSettingsPushRuleNotificationPreferenceFragment() {
@@ -50,7 +50,7 @@ class VectorSettingsKeywordAndMentionsNotificationPreferenceFragment :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        session.getKeywords().observe(viewLifecycleOwner, this::updateWithKeywords)
+        session.pushRuleService().getKeywords().observe(viewLifecycleOwner, this::updateWithKeywords)
     }
 
     override fun bindPref() {
@@ -61,7 +61,7 @@ class VectorSettingsKeywordAndMentionsNotificationPreferenceFragment :
         val yourKeywordsCategory = findPreference<VectorPreferenceCategory>("SETTINGS_YOUR_KEYWORDS")!!
         yourKeywordsCategory.isIconSpaceReserved = false
 
-        val keywordRules = session.getPushRules().content?.filter { !it.ruleId.startsWith(".") }.orEmpty()
+        val keywordRules = session.pushRuleService().getPushRules().content?.filter { !it.ruleId.startsWith(".") }.orEmpty()
         val enableKeywords = keywordRules.isEmpty() || keywordRules.any(PushRule::enabled)
 
         val editKeywordPreference = findPreference<KeywordPreference>("SETTINGS_KEYWORD_EDIT")!!
@@ -119,10 +119,12 @@ class VectorSettingsKeywordAndMentionsNotificationPreferenceFragment :
             val results = keywords.map {
                 runCatching {
                     withContext(Dispatchers.Default) {
-                        session.updatePushRuleActions(RuleKind.CONTENT,
+                        session.pushRuleService().updatePushRuleActions(
+                                RuleKind.CONTENT,
                                 it,
                                 enabled,
-                                newActions)
+                                newActions
+                        )
                     }
                 }
             }
@@ -151,7 +153,7 @@ class VectorSettingsKeywordAndMentionsNotificationPreferenceFragment :
         displayLoadingView()
         lifecycleScope.launch {
             val result = runCatching {
-                session.addPushRule(RuleKind.CONTENT, newRule)
+                session.pushRuleService().addPushRule(RuleKind.CONTENT, newRule)
             }
             hideLoadingView()
             if (!isAdded) {
@@ -167,7 +169,7 @@ class VectorSettingsKeywordAndMentionsNotificationPreferenceFragment :
         displayLoadingView()
         lifecycleScope.launch {
             val result = runCatching {
-                session.removePushRule(RuleKind.CONTENT, keyword)
+                session.pushRuleService().removePushRule(RuleKind.CONTENT, keyword)
             }
             hideLoadingView()
             if (!isAdded) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
index 79104433ee..1d76ed8500 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
@@ -53,11 +53,11 @@ import im.vector.app.push.fcm.FcmHelper
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
-import org.matrix.android.sdk.api.pushrules.RuleIds
-import org.matrix.android.sdk.api.pushrules.RuleKind
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.api.session.pushers.Pusher
+import org.matrix.android.sdk.api.session.pushrules.RuleIds
+import org.matrix.android.sdk.api.session.pushrules.RuleKind
 import javax.inject.Inject
 
 // Referenced in vector_settings_preferences_root.xml
@@ -81,7 +81,7 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
 
     override fun bindPref() {
         findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY)!!.let { pref ->
-            val pushRuleService = session
+            val pushRuleService = session.pushRuleService()
             val mRuleMaster = pushRuleService.getPushRules().getAllRules()
                     .find { it.ruleId == RuleIds.RULE_ID_DISABLE_ALL }
 
@@ -104,7 +104,7 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
                 } else {
                     FcmHelper.getFcmToken(requireContext())?.let {
                         pushManager.unregisterPusher(it)
-                        session.refreshPushers()
+                        session.pushersService().refreshPushers()
                     }
                 }
             }
@@ -204,7 +204,7 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
             // Important, Battery optim white listing is needed in this mode;
             // Even if using foreground service with foreground notif, it stops to work
             // in doze mode for certain devices :/
-            if (!isIgnoringBatteryOptimizations(requireContext())) {
+            if (!requireContext().isIgnoringBatteryOptimizations()) {
                 requestDisablingBatteryOptimization(requireActivity(), batteryStartForActivityResult)
             }
         }
@@ -318,7 +318,7 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
 
     override fun onResume() {
         super.onResume()
-        activeSessionHolder.getSafeActiveSession()?.refreshPushers()
+        activeSessionHolder.getSafeActiveSession()?.pushersService()?.refreshPushers()
 
         interactionListener?.requestedKeyToHighlight()?.let { key ->
             interactionListener?.requestHighlightPreferenceKeyOnResume(null)
@@ -365,7 +365,7 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
     }
 
     private fun updateEnabledForAccount(preference: Preference?) {
-        val pushRuleService = session
+        val pushRuleService = session.pushRuleService()
         val switchPref = preference as SwitchPreference
         pushRuleService.getPushRules().getAllRules()
                 .find { it.ruleId == RuleIds.RULE_ID_DISABLE_ALL }
@@ -373,9 +373,11 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
                     // Trick, we must enable this room to disable notifications
                     lifecycleScope.launch {
                         try {
-                            pushRuleService.updatePushRuleEnableStatus(RuleKind.OVERRIDE,
+                            pushRuleService.updatePushRuleEnableStatus(
+                                    RuleKind.OVERRIDE,
                                     it,
-                                    !switchPref.isChecked)
+                                    !switchPref.isChecked
+                            )
                             // Push rules will be updated from the sync
                         } catch (failure: Throwable) {
                             if (!isAdded) {
@@ -414,15 +416,15 @@ private fun SwitchPreference.setTransactionalSwitchChangeListener(scope: Corouti
  * @see ThreePid.Email
  */
 private fun Session.getEmailsWithPushInformation(): List<Pair<ThreePid.Email, Boolean>> {
-    val emailPushers = getPushers().filter { it.kind == Pusher.KIND_EMAIL }
-    return getThreePids()
+    val emailPushers = pushersService().getPushers().filter { it.kind == Pusher.KIND_EMAIL }
+    return profileService().getThreePids()
             .filterIsInstance<ThreePid.Email>()
             .map { it to emailPushers.any { pusher -> pusher.pushKey == it.email } }
 }
 
 private fun Session.getEmailsWithPushInformationLive(): LiveData<List<Pair<ThreePid.Email, Boolean>>> {
-    val emailThreePids = getThreePidsLive(refreshData = true).map { it.filterIsInstance<ThreePid.Email>() }
-    val emailPushers = getPushersLive().map { it.filter { pusher -> pusher.kind == Pusher.KIND_EMAIL } }
+    val emailThreePids = profileService().getThreePidsLive(refreshData = true).map { it.filterIsInstance<ThreePid.Email>() }
+    val emailPushers = pushersService().getPushersLive().map { it.filter { pusher -> pusher.kind == Pusher.KIND_EMAIL } }
     return combineLatest(emailThreePids, emailPushers) { emailThreePidsResult, emailPushersResult ->
         emailThreePidsResult.map { it to emailPushersResult.any { pusher -> pusher.pushKey == it.email } }
     }.distinctUntilChanged()
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsOtherNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsOtherNotificationPreferenceFragment.kt
index 71f8f0920a..3638fb8526 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsOtherNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsOtherNotificationPreferenceFragment.kt
@@ -18,21 +18,21 @@ package im.vector.app.features.settings.notifications
 
 import im.vector.app.R
 import im.vector.app.core.preference.VectorPreferenceCategory
-import org.matrix.android.sdk.api.pushrules.RuleIds
+import org.matrix.android.sdk.api.session.pushrules.RuleIds
 
 class VectorSettingsOtherNotificationPreferenceFragment :
-    VectorSettingsPushRuleNotificationPreferenceFragment() {
+        VectorSettingsPushRuleNotificationPreferenceFragment() {
 
     override var titleRes: Int = R.string.settings_notification_other
 
     override val preferenceXmlRes = R.xml.vector_settings_notification_other
 
     override val prefKeyToPushRuleId = mapOf(
-                "SETTINGS_PUSH_RULE_INVITED_TO_ROOM_PREFERENCE_KEY" to RuleIds.RULE_ID_INVITE_ME,
-                "SETTINGS_PUSH_RULE_CALL_INVITATIONS_PREFERENCE_KEY" to RuleIds.RULE_ID_CALL,
-                "SETTINGS_PUSH_RULE_MESSAGES_SENT_BY_BOT_PREFERENCE_KEY" to RuleIds.RULE_ID_SUPPRESS_BOTS_NOTIFICATIONS,
-                "SETTINGS_PUSH_RULE_ROOMS_UPGRADED_KEY" to RuleIds.RULE_ID_TOMBSTONE
-        )
+            "SETTINGS_PUSH_RULE_INVITED_TO_ROOM_PREFERENCE_KEY" to RuleIds.RULE_ID_INVITE_ME,
+            "SETTINGS_PUSH_RULE_CALL_INVITATIONS_PREFERENCE_KEY" to RuleIds.RULE_ID_CALL,
+            "SETTINGS_PUSH_RULE_MESSAGES_SENT_BY_BOT_PREFERENCE_KEY" to RuleIds.RULE_ID_SUPPRESS_BOTS_NOTIFICATIONS,
+            "SETTINGS_PUSH_RULE_ROOMS_UPGRADED_KEY" to RuleIds.RULE_ID_TOMBSTONE
+    )
 
     override fun bindPref() {
         super.bindPref()
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsPushRuleNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsPushRuleNotificationPreferenceFragment.kt
index 26ee2fc601..7f856298ea 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsPushRuleNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsPushRuleNotificationPreferenceFragment.kt
@@ -21,11 +21,11 @@ import androidx.preference.Preference
 import im.vector.app.core.preference.VectorCheckboxPreference
 import im.vector.app.features.settings.VectorSettingsBaseFragment
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.pushrules.RuleKind
-import org.matrix.android.sdk.api.pushrules.rest.PushRuleAndKind
+import org.matrix.android.sdk.api.session.pushrules.RuleKind
+import org.matrix.android.sdk.api.session.pushrules.rest.PushRuleAndKind
 
 abstract class VectorSettingsPushRuleNotificationPreferenceFragment :
-    VectorSettingsBaseFragment() {
+        VectorSettingsBaseFragment() {
 
     abstract val prefKeyToPushRuleId: Map<String, String>
 
@@ -33,7 +33,7 @@ abstract class VectorSettingsPushRuleNotificationPreferenceFragment :
         for (preferenceKey in prefKeyToPushRuleId.keys) {
             val preference = findPreference<VectorCheckboxPreference>(preferenceKey)!!
             preference.isIconSpaceReserved = false
-            val ruleAndKind: PushRuleAndKind? = session.getPushRules().findDefaultRule(prefKeyToPushRuleId[preferenceKey])
+            val ruleAndKind: PushRuleAndKind? = session.pushRuleService().getPushRules().findDefaultRule(prefKeyToPushRuleId[preferenceKey])
             if (ruleAndKind == null) {
                 // The rule is not defined, hide the preference
                 preference.isVisible = false
@@ -58,10 +58,12 @@ abstract class VectorSettingsPushRuleNotificationPreferenceFragment :
 
         lifecycleScope.launch {
             val result = runCatching {
-                session.updatePushRuleActions(kind,
+                session.pushRuleService().updatePushRuleActions(
+                        kind,
                         ruleId,
                         enabled,
-                        newActions)
+                        newActions
+                )
             }
             hideLoadingView()
             if (!isAdded) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
index 4d95447f2d..14b7a53b65 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
@@ -49,7 +49,7 @@ class PushGatewaysViewModel @AssistedInject constructor(@Assisted initialState:
     init {
         observePushers()
         // Force a refresh
-        session.refreshPushers()
+        session.pushersService().refreshPushers()
     }
 
     private fun observePushers() {
@@ -70,7 +70,7 @@ class PushGatewaysViewModel @AssistedInject constructor(@Assisted initialState:
     private fun removePusher(pusher: Pusher) {
         viewModelScope.launch {
             kotlin.runCatching {
-                session.removePusher(pusher)
+                session.pushersService().removePusher(pusher)
             }.onFailure {
                 _viewEvents.post(PushGatewayViewEvents.RemovePusherFailed(it))
             }
@@ -78,6 +78,6 @@ class PushGatewaysViewModel @AssistedInject constructor(@Assisted initialState:
     }
 
     private fun handleRefresh() {
-        session.refreshPushers()
+        session.pushersService().refreshPushers()
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt
index f6e03143f5..d56562a7dd 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt
@@ -30,8 +30,8 @@ import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.features.notifications.toNotificationAction
 import im.vector.app.features.themes.ThemeUtils
-import org.matrix.android.sdk.api.pushrules.getActions
-import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.session.pushrules.getActions
+import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
 
 @EpoxyModelClass(layout = R.layout.item_pushrule_raw)
 abstract class PushRuleItem : EpoxyModelWithHolder<PushRuleItem.Holder>() {
@@ -72,8 +72,10 @@ abstract class PushRuleItem : EpoxyModelWithHolder<PushRuleItem.Holder>() {
             val description = StringBuffer()
             pushRule.conditions?.forEachIndexed { i, condition ->
                 if (i > 0) description.append("\n")
-                description.append(condition.asExecutableCondition(pushRule)?.technicalDescription()
-                        ?: "UNSUPPORTED")
+                description.append(
+                        condition.asExecutableCondition(pushRule)?.technicalDescription()
+                                ?: "UNSUPPORTED"
+                )
             }
             if (description.isBlank()) {
                 holder.description.text = "No Conditions"
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushRulesViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushRulesViewModel.kt
index 0b6b72bb10..deda34115e 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushRulesViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushRulesViewModel.kt
@@ -23,20 +23,20 @@ import im.vector.app.core.di.SingletonEntryPoint
 import im.vector.app.core.platform.EmptyAction
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
-import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.session.pushrules.rest.PushRule
 
 data class PushRulesViewState(
         val rules: List<PushRule> = emptyList()
 ) : MavericksState
 
 class PushRulesViewModel(initialState: PushRulesViewState) :
-    VectorViewModel<PushRulesViewState, EmptyAction, EmptyViewEvents>(initialState) {
+        VectorViewModel<PushRulesViewState, EmptyAction, EmptyViewEvents>(initialState) {
 
     companion object : MavericksViewModelFactory<PushRulesViewModel, PushRulesViewState> {
 
         override fun initialState(viewModelContext: ViewModelContext): PushRulesViewState? {
             val session = EntryPoints.get(viewModelContext.app(), SingletonEntryPoint::class.java).activeSessionHolder().getActiveSession()
-            val rules = session.getPushRules().getAllRules()
+            val rules = session.pushRuleService().getPushRules().getAllRules()
             return PushRulesViewState(rules)
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
index ee7f8efab4..4a3f895c51 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
@@ -61,24 +61,27 @@ class ThreePidsSettingsFragment @Inject constructor(
 
         viewModel.observeViewEvents {
             when (it) {
-                is ThreePidsSettingsViewEvents.Failure -> displayErrorDialog(it.throwable)
+                is ThreePidsSettingsViewEvents.Failure       -> displayErrorDialog(it.throwable)
                 is ThreePidsSettingsViewEvents.RequestReAuth -> askAuthentication(it)
             }
         }
     }
 
     private fun askAuthentication(event: ThreePidsSettingsViewEvents.RequestReAuth) {
-        ReAuthActivity.newIntent(requireContext(),
+        ReAuthActivity.newIntent(
+                requireContext(),
                 event.registrationFlowResponse,
                 event.lastErrorCode,
-                getString(R.string.settings_add_email_address)).let { intent ->
+                getString(R.string.settings_add_email_address)
+        ).let { intent ->
             reAuthActivityResultLauncher.launch(intent)
         }
     }
+
     private val reAuthActivityResultLauncher = registerStartForActivityResult { activityResult ->
         if (activityResult.resultCode == Activity.RESULT_OK) {
             when (activityResult.data?.extras?.getString(ReAuthActivity.RESULT_FLOW_TYPE)) {
-                LoginFlowTypes.SSO -> {
+                LoginFlowTypes.SSO      -> {
                     viewModel.handle(ThreePidsSettingsAction.SsoAuthDone)
                 }
                 LoginFlowTypes.PASSWORD -> {
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewEvents.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewEvents.kt
index 94ea8d24c6..9768d7bd93 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewEvents.kt
@@ -22,6 +22,6 @@ import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
 sealed class ThreePidsSettingsViewEvents : VectorViewEvents {
     data class Failure(val throwable: Throwable) : ThreePidsSettingsViewEvents()
 
-//    object RequestPassword : ThreePidsSettingsViewEvents()
+    //    object RequestPassword : ThreePidsSettingsViewEvents()
     data class RequestReAuth(val registrationFlowResponse: RegistrationFlowResponse, val lastErrorCode: String?) : ThreePidsSettingsViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
index 0af0a8baa5..6f26dd2b15 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
@@ -133,7 +133,8 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
                 }
             }
             is ThreePidsSettingsAction.PasswordAuthDone -> {
-                val decryptedPass = session.loadSecureSecret<String>(action.password.fromBase64().inputStream(), ReAuthActivity.DEFAULT_RESULT_KEYSTORE_ALIAS)
+                val decryptedPass = session.secureStorageService()
+                        .loadSecureSecret<String>(action.password.fromBase64().inputStream(), ReAuthActivity.DEFAULT_RESULT_KEYSTORE_ALIAS)
                 uiaContinuation?.resume(
                         UserPasswordAuth(
                                 session = pendingAuth?.session,
@@ -175,7 +176,7 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
         viewModelScope.launch {
             // First submit the code
             try {
-                session.submitSmsCode(action.threePid, action.code)
+                session.profileService().submitSmsCode(action.threePid, action.code)
             } catch (failure: Throwable) {
                 isLoading(false)
                 setState {
@@ -190,7 +191,7 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
 
             // then finalize
             pendingThreePid = action.threePid
-            loadingSuspendable { session.finalizeAddingThreePid(action.threePid, uiaInterceptor) }
+            loadingSuspendable { session.profileService().finalizeAddingThreePid(action.threePid, uiaInterceptor) }
         }
     }
 
@@ -209,16 +210,22 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
         withState { state ->
             val allThreePids = state.threePids.invoke().orEmpty() + state.pendingThreePids.invoke().orEmpty()
             if (allThreePids.any { it.value == action.threePid.value }) {
-                _viewEvents.post(ThreePidsSettingsViewEvents.Failure(IllegalArgumentException(stringProvider.getString(
-                        when (action.threePid) {
-                            is ThreePid.Email  -> R.string.auth_email_already_defined
-                            is ThreePid.Msisdn -> R.string.auth_msisdn_already_defined
-                        }
-                ))))
+                _viewEvents.post(
+                        ThreePidsSettingsViewEvents.Failure(
+                                IllegalArgumentException(
+                                        stringProvider.getString(
+                                                when (action.threePid) {
+                                                    is ThreePid.Email  -> R.string.auth_email_already_defined
+                                                    is ThreePid.Msisdn -> R.string.auth_msisdn_already_defined
+                                                }
+                                        )
+                                )
+                        )
+                )
             } else {
                 viewModelScope.launch {
                     loadingSuspendable {
-                        session.addThreePid(action.threePid)
+                        session.profileService().addThreePid(action.threePid)
                         // Also reset the state
                         setState {
                             copy(
@@ -235,14 +242,14 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
         isLoading(true)
         pendingThreePid = action.threePid
         viewModelScope.launch {
-            loadingSuspendable { session.finalizeAddingThreePid(action.threePid, uiaInterceptor) }
+            loadingSuspendable { session.profileService().finalizeAddingThreePid(action.threePid, uiaInterceptor) }
         }
     }
 
     private fun handleCancelThreePid(action: ThreePidsSettingsAction.CancelThreePid) {
         isLoading(true)
         viewModelScope.launch {
-            loadingSuspendable { session.cancelAddingThreePid(action.threePid) }
+            loadingSuspendable { session.profileService().cancelAddingThreePid(action.threePid) }
         }
     }
 
@@ -258,7 +265,7 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
     private fun handleDeleteThreePid(action: ThreePidsSettingsAction.DeleteThreePid) {
         isLoading(true)
         viewModelScope.launch {
-            loadingSuspendable { session.deleteThreePid(action.threePid) }
+            loadingSuspendable { session.profileService().deleteThreePid(action.threePid) }
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
index 8f0b2cfe74..8f762a9abc 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
@@ -25,7 +25,7 @@ import im.vector.app.databinding.ItemNotificationTroubleshootBinding
 import im.vector.app.features.themes.ThemeUtils
 
 class NotificationTroubleshootRecyclerViewAdapter(val tests: ArrayList<TroubleshootTest>) :
-    RecyclerView.Adapter<NotificationTroubleshootRecyclerViewAdapter.ViewHolder>() {
+        RecyclerView.Adapter<NotificationTroubleshootRecyclerViewAdapter.ViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         val inflater = LayoutInflater.from(parent.context)
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
index 9d06e1724c..b6e78fa580 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
@@ -25,8 +25,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.extensions.tryOrNull
-import org.matrix.android.sdk.api.pushrules.RuleIds
-import org.matrix.android.sdk.api.pushrules.RuleKind
+import org.matrix.android.sdk.api.session.pushrules.RuleIds
+import org.matrix.android.sdk.api.session.pushrules.RuleKind
 import javax.inject.Inject
 
 /**
@@ -34,11 +34,11 @@ import javax.inject.Inject
  */
 class TestAccountSettings @Inject constructor(private val stringProvider: StringProvider,
                                               private val activeSessionHolder: ActiveSessionHolder) :
-    TroubleshootTest(R.string.settings_troubleshoot_test_account_settings_title) {
+        TroubleshootTest(R.string.settings_troubleshoot_test_account_settings_title) {
 
     override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         val session = activeSessionHolder.getSafeActiveSession() ?: return
-        val defaultRule = session.getPushRules().getAllRules()
+        val defaultRule = session.pushRuleService().getPushRules().getAllRules()
                 .find { it.ruleId == RuleIds.RULE_ID_DISABLE_ALL }
 
         if (defaultRule != null) {
@@ -54,7 +54,7 @@ class TestAccountSettings @Inject constructor(private val stringProvider: String
 
                         session.coroutineScope.launch {
                             tryOrNull {
-                                session.updatePushRuleEnableStatus(RuleKind.OVERRIDE, defaultRule, !defaultRule.enabled)
+                                session.pushRuleService().updatePushRuleEnableStatus(RuleKind.OVERRIDE, defaultRule, !defaultRule.enabled)
                             }
                             withContext(Dispatchers.Main) {
                                 manager?.retry(activityResultLauncher)
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestDeviceSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestDeviceSettings.kt
index f9fc7e80e3..c58b7f4ebc 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestDeviceSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestDeviceSettings.kt
@@ -27,7 +27,7 @@ import javax.inject.Inject
  */
 class TestDeviceSettings @Inject constructor(private val vectorPreferences: VectorPreferences,
                                              private val stringProvider: StringProvider) :
-    TroubleshootTest(R.string.settings_troubleshoot_test_device_settings_title) {
+        TroubleshootTest(R.string.settings_troubleshoot_test_device_settings_title) {
 
     override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         if (vectorPreferences.areNotificationEnabledForDevice()) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNotification.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNotification.kt
index 412916c201..1efe76205a 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNotification.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNotification.kt
@@ -30,7 +30,7 @@ import javax.inject.Inject
 class TestNotification @Inject constructor(private val context: Context,
                                            private val notificationUtils: NotificationUtils,
                                            private val stringProvider: StringProvider) :
-    TroubleshootTest(R.string.settings_troubleshoot_test_notification_title) {
+        TroubleshootTest(R.string.settings_troubleshoot_test_notification_title) {
 
     override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         // Display the notification right now
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
index 79e4377a5c..ae57babf9a 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
@@ -21,23 +21,25 @@ import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.notifications.toNotificationAction
-import org.matrix.android.sdk.api.pushrules.RuleIds
-import org.matrix.android.sdk.api.pushrules.getActions
+import org.matrix.android.sdk.api.session.pushrules.RuleIds
+import org.matrix.android.sdk.api.session.pushrules.getActions
 import javax.inject.Inject
 
 class TestPushRulesSettings @Inject constructor(private val activeSessionHolder: ActiveSessionHolder,
                                                 private val stringProvider: StringProvider) :
-    TroubleshootTest(R.string.settings_troubleshoot_test_bing_settings_title) {
+        TroubleshootTest(R.string.settings_troubleshoot_test_bing_settings_title) {
 
     private val testedRules =
-            listOf(RuleIds.RULE_ID_CONTAIN_DISPLAY_NAME,
+            listOf(
+                    RuleIds.RULE_ID_CONTAIN_DISPLAY_NAME,
                     RuleIds.RULE_ID_CONTAIN_USER_NAME,
                     RuleIds.RULE_ID_ONE_TO_ONE_ROOM,
-                    RuleIds.RULE_ID_ALL_OTHER_MESSAGES_ROOMS)
+                    RuleIds.RULE_ID_ALL_OTHER_MESSAGES_ROOMS
+            )
 
     override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         val session = activeSessionHolder.getSafeActiveSession() ?: return
-        val pushRules = session.getPushRules().getAllRules()
+        val pushRules = session.pushRuleService().getPushRules().getAllRules()
         var oneOrMoreRuleIsOff = false
         var oneOrMoreRuleAreSilent = false
         testedRules.forEach { ruleId ->
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt
index 42f506d4a6..f3e64659cf 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt
@@ -29,7 +29,7 @@ import javax.inject.Inject
  */
 class TestSystemSettings @Inject constructor(private val context: FragmentActivity,
                                              private val stringProvider: StringProvider) :
-    TroubleshootTest(R.string.settings_troubleshoot_test_system_settings_title) {
+        TroubleshootTest(R.string.settings_troubleshoot_test_system_settings_title) {
 
     override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         if (NotificationManagerCompat.from(context).areNotificationsEnabled()) {
diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
index 9dc433e96f..a6f05c8191 100644
--- a/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
@@ -37,10 +37,12 @@ import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentIncomingShareBinding
+import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.attachments.AttachmentsHelper
 import im.vector.app.features.attachments.preview.AttachmentsPreviewActivity
 import im.vector.app.features.attachments.preview.AttachmentsPreviewArgs
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
+import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
 
@@ -124,7 +126,11 @@ class IncomingShareFragment @Inject constructor(
 
     private fun handleMultipleRoomsShareDone(viewEvent: IncomingShareViewEvents.MultipleRoomsShareDone) {
         requireActivity().let {
-            navigator.openRoom(it, viewEvent.roomId)
+            navigator.openRoom(
+                    context = it,
+                    roomId = viewEvent.roomId,
+                    trigger = ViewRoom.Trigger.MobileLinkShare
+            )
             it.finish()
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt
index ca4148ebb7..d184713f60 100644
--- a/vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt
@@ -34,6 +34,7 @@ import kotlinx.coroutines.flow.sample
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.flow.flow
@@ -42,7 +43,7 @@ class IncomingShareViewModel @AssistedInject constructor(
         @Assisted initialState: IncomingShareViewState,
         private val session: Session,
         private val breadcrumbsRoomComparator: BreadcrumbsRoomComparator) :
-    VectorViewModel<IncomingShareViewState, IncomingShareAction, IncomingShareViewEvents>(initialState) {
+        VectorViewModel<IncomingShareViewState, IncomingShareAction, IncomingShareViewEvents>(initialState) {
 
     @AssistedFactory
     interface Factory : MavericksAssistedViewModelFactory<IncomingShareViewModel, IncomingShareViewState> {
@@ -118,7 +119,7 @@ class IncomingShareViewModel @AssistedInject constructor(
                 is SharedData.Text        -> {
                     state.selectedRoomIds.forEach { roomId ->
                         val room = session.getRoom(roomId)
-                        room?.sendTextMessage(sharedData.text)
+                        room?.sendService()?.sendTextMessage(sharedData.text)
                     }
                     // This is it, pass the first roomId to let the screen open it
                     _viewEvents.post(IncomingShareViewEvents.MultipleRoomsShareDone(state.selectedRoomIds.first()))
@@ -152,6 +153,7 @@ class IncomingShareViewModel @AssistedInject constructor(
                 // Pick the first room to send the media
                 selectedRoomIds.firstOrNull()
                         ?.let { roomId -> session.getRoom(roomId) }
+                        ?.sendService()
                         ?.sendMedias(grouped.notPreviewables, compressMediaBeforeSending, selectedRoomIds)
 
                 // Ensure they will not be sent twice
@@ -172,6 +174,7 @@ class IncomingShareViewModel @AssistedInject constructor(
             // Pick the first room to send the media
             selectedRoomIds.firstOrNull()
                     ?.let { roomId -> session.getRoom(roomId) }
+                    ?.sendService()
                     ?.sendMedias(attachmentData, compressMediaBeforeSending, selectedRoomIds)
             // This is it, pass the first roomId to let the screen open it
             _viewEvents.post(IncomingShareViewEvents.MultipleRoomsShareDone(selectedRoomIds.first()))
diff --git a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt
index 9acc81d0c2..d0d5bea536 100644
--- a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt
@@ -66,10 +66,12 @@ class SoftLogoutActivity : LoginActivity() {
                 supportFragmentManager.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
 
                 // And inform the user
-                showError(getString(
-                        R.string.soft_logout_sso_not_same_user_error,
-                        softLogoutViewEvents.currentUserId,
-                        softLogoutViewEvents.newUserId)
+                showError(
+                        getString(
+                                R.string.soft_logout_sso_not_same_user_error,
+                                softLogoutViewEvents.currentUserId,
+                                softLogoutViewEvents.newUserId
+                        )
                 )
             }
             is SoftLogoutViewEvents.ClearData        -> {
diff --git a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
index e2f3c14e7d..daca308ac1 100644
--- a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
@@ -74,10 +74,14 @@ class SoftLogoutController @Inject constructor(
         }
         loginTextItem {
             id("signText1")
-            text(host.stringProvider.getString(R.string.soft_logout_signin_notice,
-                    state.homeServerUrl.toReducedUrl(),
-                    state.userDisplayName,
-                    state.userId))
+            text(
+                    host.stringProvider.getString(
+                            R.string.soft_logout_signin_notice,
+                            state.homeServerUrl.toReducedUrl(),
+                            state.userDisplayName,
+                            state.userId
+                    )
+            )
         }
         if (state.hasUnsavedKeys) {
             loginTextItem {
diff --git a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt
index f40f35a6e2..ea08640ab7 100644
--- a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt
@@ -59,28 +59,34 @@ class SoftLogoutFragment @Inject constructor(
             softLogoutController.update(softLogoutViewState)
             when (val mode = softLogoutViewState.asyncHomeServerLoginFlowRequest.invoke()) {
                 is LoginMode.SsoAndPassword -> {
-                    loginViewModel.handle(LoginAction.SetupSsoForSessionRecovery(
-                            softLogoutViewState.homeServerUrl,
-                            softLogoutViewState.deviceId,
-                            mode.ssoIdentityProviders
-                    ))
+                    loginViewModel.handle(
+                            LoginAction.SetupSsoForSessionRecovery(
+                                    softLogoutViewState.homeServerUrl,
+                                    softLogoutViewState.deviceId,
+                                    mode.ssoIdentityProviders
+                            )
+                    )
                 }
-                is LoginMode.Sso -> {
-                    loginViewModel.handle(LoginAction.SetupSsoForSessionRecovery(
-                            softLogoutViewState.homeServerUrl,
-                            softLogoutViewState.deviceId,
-                            mode.ssoIdentityProviders
-                    ))
+                is LoginMode.Sso            -> {
+                    loginViewModel.handle(
+                            LoginAction.SetupSsoForSessionRecovery(
+                                    softLogoutViewState.homeServerUrl,
+                                    softLogoutViewState.deviceId,
+                                    mode.ssoIdentityProviders
+                            )
+                    )
                 }
-                LoginMode.Unsupported -> {
+                LoginMode.Unsupported       -> {
                     // Prepare the loginViewModel for a SSO/login fallback recovery
-                    loginViewModel.handle(LoginAction.SetupSsoForSessionRecovery(
-                            softLogoutViewState.homeServerUrl,
-                            softLogoutViewState.deviceId,
-                            null
-                    ))
+                    loginViewModel.handle(
+                            LoginAction.SetupSsoForSessionRecovery(
+                                    softLogoutViewState.homeServerUrl,
+                                    softLogoutViewState.deviceId,
+                                    null
+                            )
+                    )
                 }
-                else                  -> Unit
+                else                        -> Unit
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
index 00422d8872..1d67f1ec98 100644
--- a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
@@ -37,6 +37,7 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getUser
 import timber.log.Timber
 
 /**
@@ -158,9 +159,12 @@ class SoftLogoutViewModel @AssistedInject constructor(
         withState { softLogoutViewState ->
             if (softLogoutViewState.userId != action.credentials.userId) {
                 Timber.w("User login again with SSO, but using another account")
-                _viewEvents.post(SoftLogoutViewEvents.ErrorNotSameUser(
-                        softLogoutViewState.userId,
-                        action.credentials.userId))
+                _viewEvents.post(
+                        SoftLogoutViewEvents.ErrorNotSameUser(
+                                softLogoutViewState.userId,
+                                action.credentials.userId
+                        )
+                )
             } else {
                 setState {
                     copy(
@@ -169,7 +173,7 @@ class SoftLogoutViewModel @AssistedInject constructor(
                 }
                 viewModelScope.launch {
                     try {
-                        session.updateCredentials(action.credentials)
+                        session.signOutService().updateCredentials(action.credentials)
                         onSessionRestored()
                     } catch (failure: Throwable) {
                         _viewEvents.post(SoftLogoutViewEvents.Failure(failure))
@@ -192,7 +196,7 @@ class SoftLogoutViewModel @AssistedInject constructor(
         }
         viewModelScope.launch {
             try {
-                session.signInAgain(action.password)
+                session.signOutService().signInAgain(action.password)
                 onSessionRestored()
             } catch (failure: Throwable) {
                 setState {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceBetaHeaderItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceBetaHeaderItem.kt
index abe7e8d2a8..667f895d4d 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceBetaHeaderItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceBetaHeaderItem.kt
@@ -16,27 +16,12 @@
 
 package im.vector.app.features.spaces
 
-import android.view.View
-import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
-import im.vector.app.core.epoxy.ClickListener
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
-import im.vector.app.core.epoxy.onClick
 
 @EpoxyModelClass(layout = R.layout.item_space_beta_header)
 abstract class SpaceBetaHeaderItem : VectorEpoxyModel<SpaceBetaHeaderItem.Holder>() {
-
-    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
-    var clickAction: ClickListener? = null
-
-    override fun bind(holder: Holder) {
-        super.bind(holder)
-        holder.feedBackAction.onClick(clickAction)
-    }
-
-    class Holder : VectorEpoxyHolder() {
-        val feedBackAction by bind<View>(R.id.spaceBetaFeedbackAction)
-    }
+    class Holder : VectorEpoxyHolder()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
index e8f3702efc..033e2ed667 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
@@ -123,7 +123,8 @@ class SpaceCreationActivity : SimpleFragmentActivity() {
         val frag = supportFragmentManager.findFragmentByTag(fragmentClass.name) ?: createFragment(fragmentClass)
         supportFragmentManager.beginTransaction()
                 .setCustomAnimations(R.anim.fade_in, R.anim.fade_out, R.anim.fade_in, R.anim.fade_out)
-                .replace(views.container.id,
+                .replace(
+                        views.container.id,
                         frag,
                         fragmentClass.name
                 )
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
index f4610805bc..a46d38349d 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
@@ -30,7 +30,9 @@ import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.replaceFragment
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivitySimpleBinding
+import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.matrixto.MatrixToBottomSheet
+import im.vector.app.features.matrixto.OriginOfMatrixTo
 import im.vector.app.features.navigation.Navigator
 import im.vector.app.features.roomdirectory.createroom.CreateRoomActivity
 import im.vector.app.features.spaces.explore.SpaceDirectoryArgs
@@ -92,17 +94,23 @@ class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>(), Matrix
                     finish()
                 }
                 is SpaceDirectoryViewEvents.NavigateToRoom            -> {
-                    navigator.openRoom(this, it.roomId)
+                    navigator.openRoom(
+                            context = this,
+                            roomId = it.roomId,
+                            trigger = ViewRoom.Trigger.SpaceHierarchy
+                    )
                 }
                 is SpaceDirectoryViewEvents.NavigateToMxToBottomSheet -> {
-                    MatrixToBottomSheet.withLink(it.link).show(supportFragmentManager, "ShowChild")
+                    MatrixToBottomSheet.withLink(it.link, OriginOfMatrixTo.SPACE_EXPLORE).show(supportFragmentManager, "ShowChild")
                 }
                 is SpaceDirectoryViewEvents.NavigateToCreateNewRoom   -> {
-                    createRoomResultLauncher.launch(CreateRoomActivity.getIntent(
-                            this,
-                            openAfterCreate = false,
-                            currentSpaceId = it.currentSpaceId
-                    ))
+                    createRoomResultLauncher.launch(
+                            CreateRoomActivity.getIntent(
+                                    this,
+                                    openAfterCreate = false,
+                                    currentSpaceId = it.currentSpaceId
+                            )
+                    )
                 }
             }
         }
@@ -121,8 +129,8 @@ class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>(), Matrix
         }
     }
 
-    override fun mxToBottomSheetNavigateToRoom(roomId: String) {
-        navigator.openRoom(this, roomId)
+    override fun mxToBottomSheetNavigateToRoom(roomId: String, trigger: ViewRoom.Trigger?) {
+        navigator.openRoom(this, roomId, trigger = trigger)
     }
 
     override fun mxToBottomSheetSwitchToSpace(spaceId: String) {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt
index a239e939ea..52b6cc0749 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt
@@ -40,7 +40,6 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.launch
@@ -50,6 +49,7 @@ import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.group.groupSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.RoomSortOrder
 import org.matrix.android.sdk.api.session.room.accountdata.RoomAccountDataTypes
@@ -82,7 +82,7 @@ class SpaceListViewModel @AssistedInject constructor(@Assisted initialState: Spa
 
     init {
 
-        session.getUserLive(session.myUserId)
+        session.userService().getUserLive(session.myUserId)
                 .asFlow()
                 .setOnEach {
                     copy(
@@ -100,14 +100,14 @@ class SpaceListViewModel @AssistedInject constructor(@Assisted initialState: Spa
                     )
                 }
 
-        session.getGroupSummariesLive(groupSummaryQueryParams {})
+        session.groupService().getGroupSummariesLive(groupSummaryQueryParams {})
                 .asFlow()
                 .setOnEach {
                     copy(legacyGroups = it)
                 }
 
         // XXX there should be a way to refactor this and share it
-        session.getPagedRoomSummariesLive(
+        session.roomService().getPagedRoomSummariesLive(
                 roomSummaryQueryParams {
                     this.memberships = listOf(Membership.JOIN)
                     this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null).takeIf {
@@ -120,11 +120,11 @@ class SpaceListViewModel @AssistedInject constructor(@Assisted initialState: Spa
                     val inviteCount = if (autoAcceptInvites.hideInvites) {
                         0
                     } else {
-                        session.getRoomSummaries(
+                        session.roomService().getRoomSummaries(
                                 roomSummaryQueryParams { this.memberships = listOf(Membership.INVITE) }
                         ).size
                     }
-                    val totalCount = session.getNotificationCountForRooms(
+                    val totalCount = session.roomService().getNotificationCountForRooms(
                             roomSummaryQueryParams {
                                 this.memberships = listOf(Membership.JOIN)
                                 this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null).takeIf {
@@ -212,7 +212,8 @@ class SpaceListViewModel @AssistedInject constructor(@Assisted initialState: Spa
         }
         session.coroutineScope.launch {
             orderCommands.forEach {
-                session.getRoom(it.spaceId)?.updateAccountData(RoomAccountDataTypes.EVENT_TYPE_SPACE_ORDER,
+                session.getRoom(it.spaceId)?.roomAccountDataService()?.updateAccountData(
+                        RoomAccountDataTypes.EVENT_TYPE_SPACE_ORDER,
                         SpaceOrderContent(order = it.order).toContent()
                 )
             }
@@ -278,31 +279,24 @@ class SpaceListViewModel @AssistedInject constructor(@Assisted initialState: Spa
             displayName = QueryStringValue.IsNotEmpty
         }
 
-        val flowSession = session.flow()
-
         combine(
-                flowSession
-                        .liveUser(session.myUserId)
-                        .map {
-                            it.getOrNull()
-                        },
-                flowSession
+                session.flow()
                         .liveSpaceSummaries(params),
-                session
-                        .accountDataService()
+                session.accountDataService()
                         .getLiveRoomAccountDataEvents(setOf(RoomAccountDataTypes.EVENT_TYPE_SPACE_ORDER))
                         .asFlow()
-        ) { _, communityGroups, _ ->
-            communityGroups
+        ) { spaces, _ ->
+            spaces
         }
                 .execute { async ->
-                    val rootSpaces = session.spaceService().getRootSpaceSummaries()
-                    val orders = rootSpaces.map {
+                    val rootSpaces = async.invoke().orEmpty().filter { it.flattenParentIds.isEmpty() }
+                    val orders = rootSpaces.associate {
                         it.roomId to session.getRoom(it.roomId)
+                                ?.roomAccountDataService()
                                 ?.getAccountDataEvent(RoomAccountDataTypes.EVENT_TYPE_SPACE_ORDER)
                                 ?.content.toModel<SpaceOrderContent>()
                                 ?.safeOrder()
-                    }.toMap()
+                    }
                     copy(
                             asyncSpaces = async,
                             rootSpacesOrdered = rootSpaces.sortedWith(TopLevelSpaceComparator(orders)),
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceMenuViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceMenuViewModel.kt
index cf3d01681b..4e1489ef9b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceMenuViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceMenuViewModel.kt
@@ -38,6 +38,8 @@ import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.api.session.room.powerlevels.Role
@@ -136,7 +138,7 @@ class SpaceMenuViewModel @AssistedInject constructor(
                 } else if (state.leaveMode == SpaceMenuState.LeaveMode.LEAVE_ALL) {
                     // need to find all child rooms that i have joined
 
-                    session.getRoomSummaries(
+                    session.roomService().getRoomSummaries(
                             roomSummaryQueryParams {
                                 excludeType = null
                                 activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(initialState.spaceId)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index 95e4405da5..ca9c05f3f9 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -42,7 +42,8 @@ import javax.inject.Inject
 class SpaceSummaryController @Inject constructor(
         private val avatarRenderer: AvatarRenderer,
         private val colorProvider: ColorProvider,
-        private val stringProvider: StringProvider) : EpoxyController() {
+        private val stringProvider: StringProvider,
+) : EpoxyController() {
 
     var callback: Callback? = null
     private var viewState: SpaceListViewState? = null
@@ -62,7 +63,8 @@ class SpaceSummaryController @Inject constructor(
                 nonNullViewState.selectedGroupingMethod,
                 nonNullViewState.rootSpacesOrdered,
                 nonNullViewState.expandedStates,
-                nonNullViewState.homeAggregateCount)
+                nonNullViewState.homeAggregateCount
+        )
 
         if (!nonNullViewState.legacyGroups.isNullOrEmpty()) {
             genericFooterItem {
@@ -82,8 +84,10 @@ class SpaceSummaryController @Inject constructor(
                     avatarRenderer(host.avatarRenderer)
                     id("all_communities")
                     matrixItem(mxItem.copy(displayName = host.stringProvider.getString(R.string.group_all_communities)))
-                    selected(nonNullViewState.selectedGroupingMethod is RoomGroupingMethod.ByLegacyGroup &&
-                            nonNullViewState.selectedGroupingMethod.group() == null)
+                    selected(
+                            nonNullViewState.selectedGroupingMethod is RoomGroupingMethod.ByLegacyGroup &&
+                                    nonNullViewState.selectedGroupingMethod.group() == null
+                    )
                     listener { host.callback?.onGroupSelected(null) }
                 }
             }
@@ -93,8 +97,10 @@ class SpaceSummaryController @Inject constructor(
                     avatarRenderer(host.avatarRenderer)
                     id(groupSummary.groupId)
                     matrixItem(groupSummary.toMatrixItem())
-                    selected(nonNullViewState.selectedGroupingMethod is RoomGroupingMethod.ByLegacyGroup &&
-                            nonNullViewState.selectedGroupingMethod.group()?.groupId == groupSummary.groupId)
+                    selected(
+                            nonNullViewState.selectedGroupingMethod is RoomGroupingMethod.ByLegacyGroup &&
+                                    nonNullViewState.selectedGroupingMethod.group()?.groupId == groupSummary.groupId
+                    )
                     listener { host.callback?.onGroupSelected(groupSummary) }
                 }
             }
@@ -109,18 +115,15 @@ class SpaceSummaryController @Inject constructor(
         val host = this
         spaceBetaHeaderItem {
             id("beta_header")
-            clickAction {
-                host.callback?.sendFeedBack()
-            }
         }
 
         // show invites on top
-
-        summaries?.filter { it.membership == Membership.INVITE }
+        summaries
+                ?.filter { it.membership == Membership.INVITE }
                 ?.forEach { roomSummary ->
                     spaceSummaryItem {
                         avatarRenderer(host.avatarRenderer)
-                        id(roomSummary.roomId)
+                        id("invite_${roomSummary.roomId}")
                         matrixItem(roomSummary.toMatrixItem())
                         countState(UnreadCounterBadgeView.State(1, true))
                         selected(false)
@@ -138,33 +141,34 @@ class SpaceSummaryController @Inject constructor(
         }
 
         rootSpaces
-                ?.forEach { groupSummary ->
-                    val isSelected = selected is RoomGroupingMethod.BySpace && groupSummary.roomId == selected.space()?.roomId
+                ?.filter { it.membership != Membership.INVITE }
+                ?.forEach { roomSummary ->
+                    val isSelected = selected is RoomGroupingMethod.BySpace && roomSummary.roomId == selected.space()?.roomId
                     // does it have children?
-                    val subSpaces = groupSummary.spaceChildren?.filter { childInfo ->
+                    val subSpaces = roomSummary.spaceChildren?.filter { childInfo ->
                         summaries?.any { it.roomId == childInfo.childRoomId }.orFalse()
                     }?.sortedWith(subSpaceComparator)
                     val hasChildren = (subSpaces?.size ?: 0) > 0
-                    val expanded = expandedStates[groupSummary.roomId] == true
+                    val expanded = expandedStates[roomSummary.roomId] == true
 
                     spaceSummaryItem {
                         avatarRenderer(host.avatarRenderer)
-                        id(groupSummary.roomId)
+                        id(roomSummary.roomId)
                         hasChildren(hasChildren)
                         expanded(expanded)
                         // to debug order
                         // matrixItem(groupSummary.copy(displayName = "${groupSummary.displayName} / ${spaceOrderInfo?.get(groupSummary.roomId)}")
                         // .toMatrixItem())
-                        matrixItem(groupSummary.toMatrixItem())
+                        matrixItem(roomSummary.toMatrixItem())
                         selected(isSelected)
                         canDrag(true)
-                        onMore { host.callback?.onSpaceSettings(groupSummary) }
-                        listener { host.callback?.onSpaceSelected(groupSummary) }
-                        toggleExpand { host.callback?.onToggleExpand(groupSummary) }
+                        onMore { host.callback?.onSpaceSettings(roomSummary) }
+                        listener { host.callback?.onSpaceSelected(roomSummary) }
+                        toggleExpand { host.callback?.onToggleExpand(roomSummary) }
                         countState(
                                 UnreadCounterBadgeView.State(
-                                        groupSummary.notificationCount,
-                                        groupSummary.highlightCount > 0
+                                        roomSummary.notificationCount,
+                                        roomSummary.highlightCount > 0
                                 )
                         )
                     }
@@ -172,7 +176,7 @@ class SpaceSummaryController @Inject constructor(
                     if (hasChildren && expanded) {
                         // it's expanded
                         subSpaces?.forEach { child ->
-                            buildSubSpace(groupSummary.roomId, summaries, expandedStates, selected, child, 1, 3)
+                            buildSubSpace(roomSummary.roomId, summaries, expandedStates, selected, child, 1, 3)
                         }
                     }
                 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
index 6cffabd851..cc75fd5b2e 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
@@ -65,7 +65,8 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
         if (hasChildren) {
             holder.collapseIndicator.isVisible = true
             holder.collapseIndicator.setImageDrawable(
-                    ContextCompat.getDrawable(holder.view.context,
+                    ContextCompat.getDrawable(
+                            holder.view.context,
                             if (expanded) R.drawable.ic_expand_less else R.drawable.ic_expand_more
                     )
             )
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
index f50d418de3..201282b113 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
@@ -57,7 +57,8 @@ abstract class SubSpaceSummaryItem : VectorEpoxyModel<SubSpaceSummaryItem.Holder
         holder.moreView.onClick(onMore)
 
         holder.collapseIndicator.setImageDrawable(
-                ContextCompat.getDrawable(holder.view.context,
+                ContextCompat.getDrawable(
+                        holder.view.context,
                         if (expanded) R.drawable.ic_expand_less else R.drawable.ic_expand_more
                 )
         )
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt
index 920ceed33c..847ee5f865 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt
@@ -28,12 +28,14 @@ import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.time.Clock
 import im.vector.app.databinding.FragmentSpaceCreateGenericEpoxyFormBinding
 import javax.inject.Inject
 
 class CreateSpaceDetailsFragment @Inject constructor(
         private val epoxyController: SpaceDetailEpoxyController,
-        colorProvider: ColorProvider
+        colorProvider: ColorProvider,
+        clock: Clock,
 ) : VectorBaseFragment<FragmentSpaceCreateGenericEpoxyFormBinding>(), SpaceDetailEpoxyController.Listener,
         GalleryOrCameraDialogHelper.Listener, OnBackPressed {
 
@@ -42,7 +44,7 @@ class CreateSpaceDetailsFragment @Inject constructor(
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
             FragmentSpaceCreateGenericEpoxyFormBinding.inflate(layoutInflater, container, false)
 
-    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider)
+    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider, clock)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceState.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceState.kt
index 57782d9182..439f5491f7 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceState.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceState.kt
@@ -33,9 +33,9 @@ data class CreateSpaceState(
         val aliasManuallyModified: Boolean = false,
         val aliasVerificationTask: Async<Boolean> = Uninitialized,
         val nameInlineError: String? = null,
-        val defaultRooms: Map<Int /** position in form */, String?>? = null,
-        val default3pidInvite: Map<Int /** position in form */, String?>? = null,
-        val emailValidationResult: Map<Int /** position in form */, Boolean>? = null,
+        val defaultRooms: Map<Int, String?>? = null, // Int: position in form
+        val default3pidInvite: Map<Int, String?>? = null, // Int: position in form
+        val emailValidationResult: Map<Int, Boolean>? = null, // Int: position in form
         val creationResult: Async<String> = Uninitialized,
         val canInviteByMail: Boolean = false
 ) : MavericksState {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
index 2b8276a4d7..46da2f5826 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
@@ -315,7 +315,7 @@ class CreateSpaceViewModel @AssistedInject constructor(
                 }
                 viewModelScope.launch {
                     try {
-                        when (val result = session.checkAliasAvailability(aliasLocalPart)) {
+                        when (val result = session.roomDirectoryService().checkAliasAvailability(aliasLocalPart)) {
                             AliasAvailabilityResult.Available       -> {
                                 setState {
                                     copy(
@@ -373,7 +373,7 @@ class CreateSpaceViewModel @AssistedInject constructor(
                         )
                 )
                 when (result) {
-                    is  CreateSpaceTaskResult.Success             -> {
+                    is CreateSpaceTaskResult.Success             -> {
                         setState {
                             copy(creationResult = Success(result.spaceId))
                         }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
index d9c18db01d..c7777649bd 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
@@ -113,7 +113,7 @@ class CreateSpaceViewModelTask @Inject constructor(
                     try {
                         val roomId = try {
                             if (params.isPublic) {
-                                session.createRoom(
+                                session.roomService().createRoom(
                                         CreateRoomParams().apply {
                                             this.name = roomName
                                             this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
@@ -121,13 +121,14 @@ class CreateSpaceViewModelTask @Inject constructor(
                                 )
                             } else {
                                 val homeServerCapabilities = session
+                                        .homeServerCapabilitiesService()
                                         .getHomeServerCapabilities()
                                 val restrictedSupport = homeServerCapabilities
                                         .isFeatureSupported(HomeServerCapabilities.ROOM_CAP_RESTRICTED)
 
                                 val createRestricted = restrictedSupport == HomeServerCapabilities.RoomCapabilitySupport.SUPPORTED
                                 if (createRestricted) {
-                                    session.createRoom(CreateRoomParams().apply {
+                                    session.roomService().createRoom(CreateRoomParams().apply {
                                         this.name = roomName
                                         this.featurePreset = RestrictedRoomPreset(
                                                 homeServerCapabilities,
@@ -140,7 +141,7 @@ class CreateSpaceViewModelTask @Inject constructor(
                                         }
                                     })
                                 } else {
-                                    session.createRoom(CreateRoomParams().apply {
+                                    session.roomService().createRoom(CreateRoomParams().apply {
                                         this.name = roomName
                                         visibility = RoomDirectoryVisibility.PRIVATE
                                         this.preset = CreateRoomPreset.PRESET_PRIVATE_CHAT
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt
index b25ae4f2c7..aee405388b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt
@@ -102,7 +102,8 @@ class SpaceDetailEpoxyController @Inject constructor(
                 }
                 errorMessage(
                         host.roomAliasErrorFormatter.format(
-                                (((data.aliasVerificationTask as? Fail)?.error) as? RoomAliasError))
+                                (((data.aliasVerificationTask as? Fail)?.error) as? RoomAliasError)
+                        )
                 )
                 onTextChange(host.aliasTextWatcher)
             }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/WizardButtonView.kt b/vector/src/main/java/im/vector/app/features/spaces/create/WizardButtonView.kt
index 971d61dd9c..c1bfba7205 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/WizardButtonView.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/WizardButtonView.kt
@@ -30,7 +30,7 @@ import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.databinding.ViewSpaceTypeButtonBinding
 
 class WizardButtonView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0) :
-    ConstraintLayout(context, attrs, defStyle) {
+        ConstraintLayout(context, attrs, defStyle) {
 
     private val views: ViewSpaceTypeButtonBinding
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
index a2c1380098..9249240d5c 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
@@ -36,6 +36,7 @@ import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.list.spaceChildInfoItem
 import im.vector.lib.core.utils.epoxy.charsequence.toEpoxyCharSequence
 import me.gujun.android.span.span
+import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.MatrixError.Companion.M_UNRECOGNIZED
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
@@ -145,6 +146,7 @@ class SpaceDirectoryController @Inject constructor(
                         matrixItem(matrixItem)
                         avatarRenderer(host.avatarRenderer)
                         topic(info.topic)
+                        suggested(info.suggested.orFalse())
                         errorLabel(
                                 error?.let {
                                     host.stringProvider.getString(R.string.error_failed_to_join_room, host.errorFormatter.toHumanReadable(it))
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
index 7e7b1d8996..e59087778f 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
@@ -169,7 +169,7 @@ class SpaceDirectoryFragment @Inject constructor(
         } else {
             toolbar?.title = state.currentRootSummary?.name
                     ?: state.currentRootSummary?.canonicalAlias
-                    ?: getString(R.string.space_explore_activity_title)
+                            ?: getString(R.string.space_explore_activity_title)
         }
 
         spaceCardRenderer.render(state.currentRootSummary, emptyList(), this, views.spaceCard, showDescription = false)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
index abc70ccbc1..2ddcb42e2a 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
@@ -27,6 +27,9 @@ import dagger.assisted.AssistedInject
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.analytics.AnalyticsTracker
+import im.vector.app.features.analytics.extensions.toAnalyticsJoinedRoom
+import im.vector.app.features.analytics.plan.JoinedRoom
 import im.vector.app.features.powerlevel.PowerLevelsFlowFactory
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.launchIn
@@ -35,6 +38,8 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
@@ -47,7 +52,8 @@ import timber.log.Timber
 
 class SpaceDirectoryViewModel @AssistedInject constructor(
         @Assisted val initialState: SpaceDirectoryState,
-        private val session: Session
+        private val session: Session,
+        private val analyticsTracker: AnalyticsTracker
 ) : VectorViewModel<SpaceDirectoryState, SpaceDirectoryViewAction, SpaceDirectoryViewEvents>(initialState) {
 
     @AssistedFactory
@@ -105,8 +111,12 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
                 .onEach {
                     val powerLevelsHelper = PowerLevelsHelper(it)
                     setState {
-                        copy(canAddRooms = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true,
-                                EventType.STATE_SPACE_CHILD))
+                        copy(
+                                canAddRooms = powerLevelsHelper.isUserAllowedToSend(
+                                        session.myUserId, true,
+                                        EventType.STATE_SPACE_CHILD
+                                )
+                        )
                     }
                 }
                 .launchIn(viewModelScope)
@@ -275,9 +285,9 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
                 knownSummaries = (
                         knownSummaries +
                                 (paginate.children.mapNotNull {
-                            session.getRoomSummary(it.childRoomId)
-                                    ?.takeIf { it.membership == Membership.JOIN } // only take if joined because it will be up to date (synced)
-                        })
+                                    session.getRoomSummary(it.childRoomId)
+                                            ?.takeIf { it.membership == Membership.JOIN } // only take if joined because it will be up to date (synced)
+                                })
                         ).distinctBy { it.roomId }
 
                 query = query.copy(
@@ -409,11 +419,14 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
                     if (isSpace) {
                         session.spaceService().joinSpace(childId, null, spaceChildInfo.viaServers)
                     } else {
-                        session.joinRoom(childId, null, spaceChildInfo.viaServers)
+                        session.roomService().joinRoom(childId, null, spaceChildInfo.viaServers)
                     }
                 } catch (failure: Throwable) {
                     Timber.e(failure, "## Space: Failed to join room or subspace")
                 }
+
+                session.getRoomSummary(childId)
+                        ?.let { analyticsTracker.capture(it.toAnalyticsJoinedRoom(JoinedRoom.Trigger.SpaceHierarchy)) }
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetViewModel.kt
index b03d21e6bd..93bf51368b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetViewModel.kt
@@ -33,6 +33,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoomSummary
+import org.matrix.android.sdk.api.session.getUser
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.peeking.PeekResult
@@ -46,7 +48,7 @@ class SpaceInviteBottomSheetViewModel @AssistedInject constructor(
     init {
         session.getRoomSummary(initialState.spaceId)?.let { roomSummary ->
             val knownMembers = roomSummary.otherMemberIds.filter {
-                session.getExistingDirectRoomWithUser(it) != null
+                session.roomService().getExistingDirectRoomWithUser(it) != null
             }.mapNotNull { session.getUser(it) }
             // put one with avatar first, and take 5
             val peopleYouKnow = (knownMembers.filter { it.avatarUrl != null } + knownMembers.filter { it.avatarUrl == null })
@@ -70,7 +72,7 @@ class SpaceInviteBottomSheetViewModel @AssistedInject constructor(
      */
     private fun getLatestRoomSummary(roomSummary: RoomSummary) {
         viewModelScope.launch(Dispatchers.IO) {
-            val peekResult = tryOrNull { session.peekRoom(roomSummary.roomId) } as? PeekResult.Success ?: return@launch
+            val peekResult = tryOrNull { session.roomService().peekRoom(roomSummary.roomId) } as? PeekResult.Success ?: return@launch
             setState {
                 copy(
                         summary = Success(
diff --git a/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedViewModel.kt
index fc241e711c..3f5a27f696 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedViewModel.kt
@@ -36,6 +36,8 @@ import okhttp3.internal.toImmutableList
 import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.flow.flow
@@ -72,7 +74,7 @@ class SpaceLeaveAdvancedViewModel @AssistedInject constructor(
                     try {
                         state.selectedRooms.forEach {
                             try {
-                                session.leaveRoom(it)
+                                session.roomService().leaveRoom(it)
                             } catch (failure: Throwable) {
                                 // silently ignore?
                                 Timber.e(failure, "Fail to leave sub rooms/spaces")
@@ -110,7 +112,7 @@ class SpaceLeaveAdvancedViewModel @AssistedInject constructor(
         }
 
         viewModelScope.launch {
-            val children = session.getRoomSummaries(
+            val children = session.roomService().getRoomSummaries(
                     roomSummaryQueryParams {
                         includeType = null
                         memberships = listOf(Membership.JOIN)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
index 318f701985..0be0fb0464 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
@@ -39,6 +39,7 @@ import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.room.RoomSortOrder
 import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
 import org.matrix.android.sdk.api.session.room.model.Membership
@@ -63,8 +64,10 @@ class SpaceAddRoomsViewModel @AssistedInject constructor(
 
     companion object : MavericksViewModelFactory<SpaceAddRoomsViewModel, SpaceAddRoomsState> by hiltMavericksViewModelFactory()
 
+    private val roomService = session.roomService()
+
     val spaceUpdatableLivePageResult: UpdatableLivePageResult by lazy {
-        session.getFilteredPagedRoomSummariesLive(
+        roomService.getFilteredPagedRoomSummariesLive(
                 roomSummaryQueryParams {
                     this.memberships = listOf(Membership.JOIN)
                     this.excludeType = null
@@ -84,12 +87,12 @@ class SpaceAddRoomsViewModel @AssistedInject constructor(
 
     val spaceCountFlow: Flow<Int> by lazy {
         spaceUpdatableLivePageResult.livePagedList.asFlow()
-                .flatMapLatest { session.getRoomCountLive(spaceUpdatableLivePageResult.queryParams).asFlow() }
+                .flatMapLatest { roomService.getRoomCountLive(spaceUpdatableLivePageResult.queryParams).asFlow() }
                 .distinctUntilChanged()
     }
 
     val roomUpdatableLivePageResult: UpdatableLivePageResult by lazy {
-        session.getFilteredPagedRoomSummariesLive(
+        roomService.getFilteredPagedRoomSummariesLive(
                 roomSummaryQueryParams {
                     this.memberships = listOf(Membership.JOIN)
                     this.excludeType = listOf(RoomType.SPACE)
@@ -110,12 +113,12 @@ class SpaceAddRoomsViewModel @AssistedInject constructor(
 
     val roomCountFlow: Flow<Int> by lazy {
         roomUpdatableLivePageResult.livePagedList.asFlow()
-                .flatMapLatest { session.getRoomCountLive(roomUpdatableLivePageResult.queryParams).asFlow() }
+                .flatMapLatest { roomService.getRoomCountLive(roomUpdatableLivePageResult.queryParams).asFlow() }
                 .distinctUntilChanged()
     }
 
     val dmUpdatableLivePageResult: UpdatableLivePageResult by lazy {
-        session.getFilteredPagedRoomSummariesLive(
+        roomService.getFilteredPagedRoomSummariesLive(
                 roomSummaryQueryParams {
                     this.memberships = listOf(Membership.JOIN)
                     this.excludeType = listOf(RoomType.SPACE)
@@ -136,7 +139,7 @@ class SpaceAddRoomsViewModel @AssistedInject constructor(
 
     val dmCountFlow: Flow<Int> by lazy {
         dmUpdatableLivePageResult.livePagedList.asFlow()
-                .flatMapLatest { session.getRoomCountLive(dmUpdatableLivePageResult.queryParams).asFlow() }
+                .flatMapLatest { roomService.getRoomCountLive(dmUpdatableLivePageResult.queryParams).asFlow() }
                 .distinctUntilChanged()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewEvents.kt
index 8ba7398a2f..043c71f549 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewEvents.kt
@@ -19,6 +19,6 @@ package im.vector.app.features.spaces.manage
 import im.vector.app.core.platform.VectorViewEvents
 
 sealed class SpaceManageRoomViewEvents : VectorViewEvents {
-//    object BulkActionSuccess: SpaceManageRoomViewEvents()
+    //    object BulkActionSuccess: SpaceManageRoomViewEvents()
     data class BulkActionFailure(val errorList: List<Throwable>) : SpaceManageRoomViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt
index a1dd26a936..6896b85924 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt
@@ -33,6 +33,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoomSummary
 
 class SpaceManageRoomsViewModel @AssistedInject constructor(
         @Assisted val initialState: SpaceManageRoomViewState,
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageViewState.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageViewState.kt
index 82abc823c3..0baa4d309f 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageViewState.kt
@@ -24,6 +24,7 @@ enum class ManageType {
     Settings,
     ManageRooms
 }
+
 data class SpaceManageViewState(
         val spaceId: String = "",
         val manageType: ManageType
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt
index 7cd5a70279..afe5200fbb 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt
@@ -65,13 +65,13 @@ class SpaceSettingsController @Inject constructor(
             id("avatar")
             enabled(data.actionPermissions.canChangeAvatar)
             when (val avatarAction = data.avatarAction) {
-                RoomSettingsViewState.AvatarAction.None -> {
+                RoomSettingsViewState.AvatarAction.None            -> {
                     // Use the current value
                     avatarRenderer(host.avatarRenderer)
                     // We do not want to use the fallback avatar url, which can be the other user avatar, or the current user avatar.
                     matrixItem(roomSummary.toMatrixItem().updateAvatar(data.currentRoomAvatarUrl))
                 }
-                RoomSettingsViewState.AvatarAction.DeleteAvatar ->
+                RoomSettingsViewState.AvatarAction.DeleteAvatar    ->
                     imageUri(null)
                 is RoomSettingsViewState.AvatarAction.UpdateAvatar ->
                     imageUri(avatarAction.newAvatarUri)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
index db9420abc2..0264fdabfc 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
@@ -38,7 +38,7 @@ import im.vector.app.core.intent.getFilenameFromUri
 import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.resources.ColorProvider
-import im.vector.app.core.resources.DrawableProvider
+import im.vector.app.core.time.Clock
 import im.vector.app.core.utils.toast
 import im.vector.app.databinding.FragmentRoomSettingGenericBinding
 import im.vector.app.features.home.AvatarRenderer
@@ -60,9 +60,9 @@ import javax.inject.Inject
 
 class SpaceSettingsFragment @Inject constructor(
         private val epoxyController: SpaceSettingsController,
-        private val colorProvider: ColorProvider,
+        colorProvider: ColorProvider,
+        clock: Clock,
         private val avatarRenderer: AvatarRenderer,
-        private val drawableProvider: DrawableProvider
 ) : VectorBaseFragment<FragmentRoomSettingGenericBinding>(),
         SpaceSettingsController.Callback,
         GalleryOrCameraDialogHelper.Listener,
@@ -73,7 +73,7 @@ class SpaceSettingsFragment @Inject constructor(
 
     private lateinit var roomJoinRuleSharedActionViewModel: RoomJoinRuleSharedActionViewModel
 
-    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider)
+    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider, clock)
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) = FragmentRoomSettingGenericBinding.inflate(inflater)
 
@@ -96,8 +96,8 @@ class SpaceSettingsFragment @Inject constructor(
         viewModel.observeViewEvents {
             when (it) {
                 is RoomSettingsViewEvents.Failure -> showFailure(it.throwable)
-                RoomSettingsViewEvents.Success -> showSuccess()
-                RoomSettingsViewEvents.GoBack -> {
+                RoomSettingsViewEvents.Success    -> showSuccess()
+                RoomSettingsViewEvents.GoBack     -> {
                     ignoreChanges = true
                     vectorBaseActivity.onBackPressed()
                 }
@@ -236,7 +236,8 @@ class SpaceSettingsFragment @Inject constructor(
                 RoomSettingsAction.SetAvatarAction(
                         RoomSettingsViewState.AvatarAction.UpdateAvatar(
                                 newAvatarUri = uri,
-                                newAvatarFileName = getFilenameFromUri(requireContext(), uri) ?: UUID.randomUUID().toString())
+                                newAvatarFileName = getFilenameFromUri(requireContext(), uri) ?: UUID.randomUUID().toString()
+                        )
                 )
         )
     }
@@ -244,10 +245,10 @@ class SpaceSettingsFragment @Inject constructor(
     override fun onAvatarDelete() {
         withState(viewModel) {
             when (it.avatarAction) {
-                RoomSettingsViewState.AvatarAction.None -> {
+                RoomSettingsViewState.AvatarAction.None            -> {
                     viewModel.handle(RoomSettingsAction.SetAvatarAction(RoomSettingsViewState.AvatarAction.DeleteAvatar))
                 }
-                RoomSettingsViewState.AvatarAction.DeleteAvatar -> {
+                RoomSettingsViewState.AvatarAction.DeleteAvatar    -> {
                     /* Should not happen */
                 }
                 is RoomSettingsViewState.AvatarAction.UpdateAvatar -> {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt
index 23a76b4b68..09a0099fb7 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt
@@ -30,6 +30,7 @@ import im.vector.app.core.extensions.replaceFragment
 import im.vector.app.core.platform.GenericIdArgs
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivitySimpleLoadingBinding
+import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.spaces.share.ShareSpaceBottomSheet
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -90,7 +91,11 @@ class SpacePeopleActivity : VectorBaseActivity<ActivitySimpleLoadingBinding>() {
     }
 
     private fun navigateToRooms(action: SpacePeopleSharedAction.NavigateToRoom) {
-        navigator.openRoom(this, action.roomId)
+        navigator.openRoom(
+                context = this,
+                roomId = action.roomId,
+                trigger = ViewRoom.Trigger.MobileSpaceMembers
+        )
         finish()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewModel.kt
index 4fee675351..988f2214c9 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewModel.kt
@@ -65,7 +65,7 @@ class SpacePeopleViewModel @AssistedInject constructor(
     private fun handleChatWith(action: SpacePeopleViewAction.ChatWith) {
         val otherUserId = action.member.userId
         if (otherUserId == session.myUserId) return
-        val existingRoomId = session.getExistingDirectRoomWithUser(otherUserId)
+        val existingRoomId = session.roomService().getExistingDirectRoomWithUser(otherUserId)
         if (existingRoomId != null) {
             // just open it
             _viewEvents.post(SpacePeopleViewEvents.OpenRoom(existingRoomId))
@@ -86,7 +86,7 @@ class SpacePeopleViewModel @AssistedInject constructor(
                     }
 
             try {
-                val roomId = session.createRoom(roomParams)
+                val roomId = session.roomService().createRoom(roomParams)
                 analyticsTracker.capture(CreatedRoom(isDM = roomParams.isDirect.orFalse()))
                 _viewEvents.post(SpacePeopleViewEvents.OpenRoom(roomId))
                 setState { copy(createAndInviteState = Success(roomId)) }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt
index e97dab1d86..271b00c707 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt
@@ -105,7 +105,7 @@ class SpacePreviewFragment @Inject constructor(
                 views.spacePreviewAcceptInviteButton.isEnabled = false
                 views.spacePreviewDeclineInviteButton.isEnabled = false
             }
-            is Fail -> {
+            is Fail    -> {
                 views.spacePreviewPeekingProgress.isVisible = false
                 views.spacePreviewButtonBar.isVisible = false
             }
@@ -127,10 +127,10 @@ class SpacePreviewFragment @Inject constructor(
 
     private fun handleViewEvents(viewEvents: SpacePreviewViewEvents) {
         when (viewEvents) {
-            SpacePreviewViewEvents.Dismiss -> {
+            SpacePreviewViewEvents.Dismiss        -> {
                 sharedActionViewModel.post(SpacePreviewSharedAction.DismissAction)
             }
-            SpacePreviewViewEvents.JoinSuccess -> {
+            SpacePreviewViewEvents.JoinSuccess    -> {
                 sharedActionViewModel.post(SpacePreviewSharedAction.HideModalLoading)
                 sharedActionViewModel.post(SpacePreviewSharedAction.DismissAction)
             }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewState.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewState.kt
index 14f9a45d68..ca6a472985 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewState.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewState.kt
@@ -22,8 +22,8 @@ import com.airbnb.mvrx.Uninitialized
 
 data class SpacePreviewState(
         val idOrAlias: String,
-        val name: String?  = null,
-        val topic: String?  = null,
+        val name: String? = null,
+        val topic: String? = null,
         val avatarUrl: String? = null,
         val spaceInfo: Async<ChildInfo> = Uninitialized,
         val childInfoList: Async<List<ChildInfo>> = Uninitialized,
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
index 149f582c5c..888f4a65b5 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
@@ -31,6 +31,7 @@ import im.vector.app.core.platform.VectorViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.peeking.PeekResult
 import org.matrix.android.sdk.api.session.space.JoinSpaceResult
@@ -64,8 +65,8 @@ class SpacePreviewViewModel @AssistedInject constructor(
 
     override fun handle(action: SpacePreviewViewAction) {
         when (action) {
-            SpacePreviewViewAction.ViewReady -> handleReady()
-            SpacePreviewViewAction.AcceptInvite -> handleAcceptInvite()
+            SpacePreviewViewAction.ViewReady     -> handleReady()
+            SpacePreviewViewAction.AcceptInvite  -> handleAcceptInvite()
             SpacePreviewViewAction.DismissInvite -> handleDismissInvite()
         }
     }
@@ -103,7 +104,7 @@ class SpacePreviewViewModel @AssistedInject constructor(
                         // For now we don't handle partial success, it's just success
                         _viewEvents.post(SpacePreviewViewEvents.JoinSuccess)
                     }
-                    is JoinSpaceResult.Fail -> {
+                    is JoinSpaceResult.Fail           -> {
                         _viewEvents.post(SpacePreviewViewEvents.JoinFailure(errorFormatter.toHumanReadable(joinResult.error)))
                     }
                 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpaceTabView.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpaceTabView.kt
index 41fc8bf6b9..ea28129262 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpaceTabView.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpaceTabView.kt
@@ -24,7 +24,7 @@ import im.vector.app.R
 class SpaceTabView constructor(context: Context,
                                attrs: AttributeSet? = null,
                                defStyleAttr: Int = 0) :
-    LinearLayout(context, attrs, defStyleAttr) {
+        LinearLayout(context, attrs, defStyleAttr) {
 
     constructor(context: Context, attrs: AttributeSet) : this(context, attrs, 0) {}
     constructor(context: Context) : this(context, null, 0) {}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewModel.kt
index c624f1ed46..43d69e6fef 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceViewModel.kt
@@ -30,6 +30,8 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 
 class ShareSpaceViewModel @AssistedInject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt b/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt
index ce6df67d53..27116093d2 100755
--- a/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt
+++ b/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt
@@ -28,7 +28,7 @@ import org.matrix.android.sdk.api.session.initsync.SyncStatusService
 import org.matrix.android.sdk.api.session.sync.SyncState
 
 class SyncStateView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0) :
-    LinearLayout(context, attrs, defStyle) {
+        LinearLayout(context, attrs, defStyle) {
 
     private val views: ViewSyncStateBinding
 
@@ -54,7 +54,7 @@ class SyncStateView @JvmOverloads constructor(context: Context, attrs: Attribute
         views.syncStateProgressBar.isVisible = newState is SyncState.Running && newState.afterPause
 
         if (newState == SyncState.NoNetwork) {
-            val isAirplaneModeOn = isAirplaneModeOn(context)
+            val isAirplaneModeOn = context.isAirplaneModeOn()
             views.syncStateNoNetwork.isVisible = isAirplaneModeOn.not()
             views.syncStateNoNetworkAirplane.isVisible = isAirplaneModeOn
         } else {
diff --git a/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt
index 8fe1f598f6..28febdac37 100644
--- a/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt
@@ -84,7 +84,7 @@ class ReviewTermsViewModel @AssistedInject constructor(
 
         viewModelScope.launch {
             try {
-                session.agreeToTerms(
+                session.termsService().agreeToTerms(
                         termsArgs.type,
                         termsArgs.baseURL,
                         agreedUrls,
@@ -109,9 +109,10 @@ class ReviewTermsViewModel @AssistedInject constructor(
 
         viewModelScope.launch {
             try {
-                val data = session.getTerms(termsArgs.type, termsArgs.baseURL)
+                val data = session.termsService().getTerms(termsArgs.type, termsArgs.baseURL)
                 val terms = data.serverResponse.getLocalizedTerms(action.preferredLanguageCode).map {
-                    Term(it.localizedUrl ?: "",
+                    Term(
+                            it.localizedUrl ?: "",
                             it.localizedName ?: "",
                             it.version,
                             accepted = data.alreadyAcceptedTermUrls.contains(it.localizedUrl)
diff --git a/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt b/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
index e46c3516ca..6693d7436c 100644
--- a/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
+++ b/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
@@ -50,12 +50,14 @@ class SharedPreferencesUiStateRepository @Inject constructor(
 
     override fun storeDisplayMode(displayMode: RoomListDisplayMode) {
         sharedPreferences.edit {
-            putInt(KEY_DISPLAY_MODE,
+            putInt(
+                    KEY_DISPLAY_MODE,
                     when (displayMode) {
                         RoomListDisplayMode.PEOPLE -> VALUE_DISPLAY_MODE_PEOPLE
                         RoomListDisplayMode.ROOMS  -> VALUE_DISPLAY_MODE_ROOMS
                         else                       -> VALUE_DISPLAY_MODE_CATCHUP
-                    })
+                    }
+            )
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/usercode/UserCodeActivity.kt b/vector/src/main/java/im/vector/app/features/usercode/UserCodeActivity.kt
index 9e0aa15297..aab83b48a0 100644
--- a/vector/src/main/java/im/vector/app/features/usercode/UserCodeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/usercode/UserCodeActivity.kt
@@ -34,7 +34,9 @@ import im.vector.app.core.extensions.replaceFragment
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.utils.onPermissionDeniedSnackbar
 import im.vector.app.databinding.ActivitySimpleBinding
+import im.vector.app.features.analytics.plan.ViewRoom
 import im.vector.app.features.matrixto.MatrixToBottomSheet
+import im.vector.app.features.matrixto.OriginOfMatrixTo
 import im.vector.app.features.qrcode.QrCodeScannerEvents
 import im.vector.app.features.qrcode.QrCodeScannerFragment
 import im.vector.app.features.qrcode.QrCodeScannerViewModel
@@ -92,7 +94,7 @@ class UserCodeActivity : VectorBaseActivity<ActivitySimpleBinding>(),
                 }
                 is UserCodeState.Mode.RESULT -> {
                     showFragment(ShowUserCodeFragment::class)
-                    MatrixToBottomSheet.withLink(mode.rawLink).show(supportFragmentManager, "MatrixToBottomSheet")
+                    MatrixToBottomSheet.withLink(mode.rawLink, OriginOfMatrixTo.USER_CODE).show(supportFragmentManager, "MatrixToBottomSheet")
                 }
             }
         }
@@ -141,8 +143,8 @@ class UserCodeActivity : VectorBaseActivity<ActivitySimpleBinding>(),
         }
     }
 
-    override fun mxToBottomSheetNavigateToRoom(roomId: String) {
-        navigator.openRoom(this, roomId)
+    override fun mxToBottomSheetNavigateToRoom(roomId: String, trigger: ViewRoom.Trigger?) {
+        navigator.openRoom(this, roomId, trigger = trigger)
     }
 
     override fun mxToBottomSheetSwitchToSpace(spaceId: String) {}
diff --git a/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt
index da894a42be..505bbdd2dd 100644
--- a/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt
@@ -31,6 +31,7 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getUser
 import org.matrix.android.sdk.api.session.permalinks.PermalinkData
 import org.matrix.android.sdk.api.session.permalinks.PermalinkParser
 import org.matrix.android.sdk.api.session.user.model.User
@@ -74,11 +75,13 @@ class UserCodeSharedViewModel @AssistedInject constructor(
     private fun handleShareByText() {
         session.permalinkService().createPermalink(session.myUserId)?.let { permalink ->
             val text = stringProvider.getString(R.string.invite_friends_text, permalink)
-            _viewEvents.post(UserCodeShareViewEvents.SharePlainText(
-                    text,
-                    stringProvider.getString(R.string.invite_friends),
-                    stringProvider.getString(R.string.invite_friends_rich_title)
-            ))
+            _viewEvents.post(
+                    UserCodeShareViewEvents.SharePlainText(
+                            text,
+                            stringProvider.getString(R.string.invite_friends),
+                            stringProvider.getString(R.string.invite_friends_rich_title)
+                    )
+            )
         }
     }
 
@@ -115,7 +118,7 @@ class UserCodeSharedViewModel @AssistedInject constructor(
                     _viewEvents.post(UserCodeShareViewEvents.ToastMessage(stringProvider.getString(R.string.not_implemented)))
                 }
                 is PermalinkData.UserLink            -> {
-                    val user = tryOrNull { session.resolveUser(linkedId.userId) }
+                    val user = tryOrNull { session.userService().resolveUser(linkedId.userId) }
                     // Create raw Uxid in case the user is not searchable
                             ?: User(linkedId.userId, null, null)
 
diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
index 783fddf8ad..bb1f8db6ff 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
@@ -47,6 +47,7 @@ import org.matrix.android.sdk.api.session.identity.IdentityServiceListener
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.api.session.user.model.User
 import org.matrix.android.sdk.api.util.toMatrixItem
+import kotlin.random.Random
 
 data class ThreePidUser(
         val email: String,
@@ -142,7 +143,7 @@ class UserListViewModel @AssistedInject constructor(
     }
 
     private fun retryUserSearch(state: UserListViewState) {
-        identityServerUsersSearch.tryEmit(UserSearch(state.searchTerm, cacheBuster = System.currentTimeMillis()))
+        identityServerUsersSearch.tryEmit(UserSearch(state.searchTerm, cacheBuster = Random.nextLong()))
     }
 
     private fun handleSearchUsers(searchTerm: String) {
@@ -191,7 +192,7 @@ class UserListViewModel @AssistedInject constructor(
         knownUsersSearch
                 .sample(300)
                 .flatMapLatest { search ->
-                    session.getPagedUsersLive(search, state.excludedUserIds).asFlow()
+                    session.userService().getPagedUsersLive(search, state.excludedUserIds).asFlow()
                 }
                 .execute {
                     copy(knownUsers = it)
@@ -212,7 +213,7 @@ class UserListViewModel @AssistedInject constructor(
                 ThreePidUser(email = search, user = null)
             } else {
                 try {
-                    val user = tryOrNull { session.getProfileAsUser(foundThreePid.matrixId) } ?: User(foundThreePid.matrixId)
+                    val user = tryOrNull { session.profileService().getProfileAsUser(foundThreePid.matrixId) } ?: User(foundThreePid.matrixId)
                     ThreePidUser(
                             email = search,
                             user = user
@@ -232,10 +233,11 @@ class UserListViewModel @AssistedInject constructor(
                 emptyList()
             } else {
                 val searchResult = session
+                        .userService()
                         .searchUsersDirectory(search, 50, state.excludedUserIds.orEmpty())
                         .sortedBy { it.toMatrixItem().firstLetterOfDisplayName() }
                 val userProfile = if (MatrixPatterns.isUserId(search)) {
-                    val user = tryOrNull { session.getProfileAsUser(search) }
+                    val user = tryOrNull { session.profileService().getProfileAsUser(search) }
                     User(
                             userId = search,
                             displayName = user?.displayName,
diff --git a/vector/src/main/java/im/vector/app/features/voice/VoicePlayerHelper.kt b/vector/src/main/java/im/vector/app/features/voice/VoicePlayerHelper.kt
index d2f7927d75..6c9b8d34c2 100644
--- a/vector/src/main/java/im/vector/app/features/voice/VoicePlayerHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/voice/VoicePlayerHelper.kt
@@ -20,11 +20,13 @@ import android.content.Context
 import android.os.Build
 import com.arthenica.ffmpegkit.FFmpegKit
 import com.arthenica.ffmpegkit.ReturnCode
+import im.vector.app.core.time.Clock
 import timber.log.Timber
 import java.io.File
 import javax.inject.Inject
 
 class VoicePlayerHelper @Inject constructor(
+        private val clock: Clock,
         context: Context
 ) {
     private val outputDirectory: File by lazy {
@@ -46,9 +48,9 @@ class VoicePlayerHelper @Inject constructor(
             if (targetFile.exists()) {
                 targetFile.delete()
             }
-            val start = System.currentTimeMillis()
+            val start = clock.epochMillis()
             val session = FFmpegKit.execute("-i \"${file.path}\" -c:a aac \"${targetFile.path}\"")
-            val duration = System.currentTimeMillis() - start
+            val duration = clock.epochMillis() - start
             Timber.d("Convert to mp4 in $duration ms. Size in bytes from ${file.length()} to ${targetFile.length()}")
             return when {
                 ReturnCode.isSuccess(session.returnCode) -> {
diff --git a/vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt b/vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt
index 2d40f5f7a3..e5fd60dbc3 100644
--- a/vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt
+++ b/vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt
@@ -23,10 +23,14 @@ import com.arthenica.ffmpegkit.FFmpegKitConfig
 import com.arthenica.ffmpegkit.Level
 import com.arthenica.ffmpegkit.ReturnCode
 import im.vector.app.BuildConfig
+import im.vector.app.core.time.Clock
 import timber.log.Timber
 import java.io.File
 
-class VoiceRecorderL(context: Context) : AbstractVoiceRecorder(context, "mp4") {
+class VoiceRecorderL(
+        context: Context,
+        private val clock: Clock,
+) : AbstractVoiceRecorder(context, "mp4") {
     override fun setOutputFormat(mediaRecorder: MediaRecorder) {
         // Use AAC/MP4 format here
         mediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4)
@@ -43,9 +47,9 @@ class VoiceRecorderL(context: Context) : AbstractVoiceRecorder(context, "mp4") {
         if (targetFile.exists()) {
             targetFile.delete()
         }
-        val start = System.currentTimeMillis()
+        val start = clock.epochMillis()
         val session = FFmpegKit.execute("-i \"${recordedFile.path}\" -c:a libvorbis \"${targetFile.path}\"")
-        val duration = System.currentTimeMillis() - start
+        val duration = clock.epochMillis() - start
         Timber.d("Convert to ogg in $duration ms. Size in bytes from ${recordedFile.length()} to ${targetFile.length()}")
         return when {
             ReturnCode.isSuccess(session.returnCode) -> {
diff --git a/vector/src/main/java/im/vector/app/features/voice/VoiceRecorderProvider.kt b/vector/src/main/java/im/vector/app/features/voice/VoiceRecorderProvider.kt
index 004d520a6f..0cee8f4f6e 100644
--- a/vector/src/main/java/im/vector/app/features/voice/VoiceRecorderProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/voice/VoiceRecorderProvider.kt
@@ -18,16 +18,18 @@ package im.vector.app.features.voice
 
 import android.content.Context
 import android.os.Build
+import im.vector.app.core.time.Clock
 import javax.inject.Inject
 
 class VoiceRecorderProvider @Inject constructor(
-        private val context: Context
+        private val context: Context,
+        private val clock: Clock,
 ) {
     fun provideVoiceRecorder(): VoiceRecorder {
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             VoiceRecorderQ(context)
         } else {
-            VoiceRecorderL(context)
+            VoiceRecorderL(context, clock)
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt b/vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt
index a3d4902b41..91253383ea 100644
--- a/vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt
+++ b/vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt
@@ -32,7 +32,7 @@ private const val RIOT_BOT_ID = "@riot-bot:matrix.org"
 class ConsentWebViewEventListener(activity: VectorBaseActivity<*>,
                                   private val session: Session,
                                   private val delegate: WebViewEventListener) :
-    WebViewEventListener by delegate {
+        WebViewEventListener by delegate {
 
     private val safeActivity: VectorBaseActivity<*>? by weak(activity)
 
diff --git a/vector/src/main/java/im/vector/app/features/webview/VectorWebViewClient.kt b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewClient.kt
index 597486491c..264c788315 100644
--- a/vector/src/main/java/im/vector/app/features/webview/VectorWebViewClient.kt
+++ b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewClient.kt
@@ -59,9 +59,11 @@ class VectorWebViewClient(private val eventListener: WebViewEventListener) : Web
 
     override fun onReceivedHttpError(view: WebView, request: WebResourceRequest, errorResponse: WebResourceResponse) {
         super.onReceivedHttpError(view, request, errorResponse)
-        eventListener.onHttpError(request.url.toString(),
+        eventListener.onHttpError(
+                request.url.toString(),
                 errorResponse.statusCode,
-                errorResponse.reasonPhrase)
+                errorResponse.reasonPhrase
+        )
     }
 
     override fun onReceivedError(view: WebView, errorCode: Int, description: String, failingUrl: String) {
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
index dbd63186b6..cd2a4dcdf4 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
@@ -156,7 +156,8 @@ class WidgetFragment @Inject constructor() :
                         integrationManagerActivityResultLauncher,
                         state.roomId,
                         state.widgetId,
-                        state.widgetKind.screenId)
+                        state.widgetKind.screenId
+                )
                 return@withState true
             }
             R.id.action_delete          -> {
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
index 51e7e6fcb7..e397eeb9a4 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
@@ -33,6 +33,8 @@ import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.room.getStateEvent
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
@@ -116,7 +118,7 @@ class WidgetPostAPIHandler @AssistedInject constructor(@Assisted private val roo
         }
         val userId = eventData["user_id"] as String
         Timber.d("Received request to get options for bot $userId in room $roomId requested")
-        val stateEvents = room.getStateEvents(setOf(EventType.BOT_OPTIONS))
+        val stateEvents = room.stateService().getStateEvents(setOf(EventType.BOT_OPTIONS))
         var botOptionsEvent: Event? = null
         val stateKey = "_$userId"
         for (stateEvent in stateEvents) {
@@ -195,7 +197,7 @@ class WidgetPostAPIHandler @AssistedInject constructor(@Assisted private val roo
             return
         }
         Timber.d("Received request join rules  in room $roomId")
-        val joinedEvents = room.getStateEvents(setOf(EventType.STATE_ROOM_JOIN_RULES))
+        val joinedEvents = room.stateService().getStateEvents(setOf(EventType.STATE_ROOM_JOIN_RULES))
         if (joinedEvents.isNotEmpty()) {
             widgetPostAPIMediator.sendObjectResponse(Event::class.java, joinedEvents.last(), eventData)
         } else {
@@ -315,7 +317,7 @@ class WidgetPostAPIHandler @AssistedInject constructor(@Assisted private val roo
         val params = HashMap<String, Any>()
         params["status"] = status
         launchWidgetAPIAction(widgetPostAPIMediator, eventData) {
-            room.sendStateEvent(
+            room.stateService().sendStateEvent(
                     eventType = EventType.PLUMBING,
                     stateKey = "",
                     body = params
@@ -340,7 +342,7 @@ class WidgetPostAPIHandler @AssistedInject constructor(@Assisted private val roo
         val stateKey = "_$userId"
 
         launchWidgetAPIAction(widgetPostAPIMediator, eventData) {
-            room.sendStateEvent(
+            room.stateService().sendStateEvent(
                     eventType = EventType.BOT_OPTIONS,
                     stateKey = stateKey,
                     body = content
@@ -382,12 +384,12 @@ class WidgetPostAPIHandler @AssistedInject constructor(@Assisted private val roo
         val userId = eventData["user_id"] as String
         val description = "Received request to invite $userId into room $roomId"
         Timber.d(description)
-        val member = room.getRoomMember(userId)
+        val member = room.membershipService().getRoomMember(userId)
         if (member != null && member.membership == Membership.JOIN) {
             widgetPostAPIMediator.sendSuccess(eventData)
         } else {
             launchWidgetAPIAction(widgetPostAPIMediator, eventData) {
-                room.invite(userId = userId)
+                room.membershipService().invite(userId = userId)
             }
         }
     }
@@ -401,7 +403,7 @@ class WidgetPostAPIHandler @AssistedInject constructor(@Assisted private val roo
         if (checkRoomId(widgetPostAPIMediator, eventData)) {
             return
         }
-        val numberOfJoinedMembers = room.getNumberOfJoinedMembers()
+        val numberOfJoinedMembers = room.membershipService().getNumberOfJoinedMembers()
         widgetPostAPIMediator.sendIntegerResponse(numberOfJoinedMembers, eventData)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt
index 20fae6e31a..c7b1429304 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt
@@ -37,6 +37,7 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
@@ -51,7 +52,7 @@ class WidgetViewModel @AssistedInject constructor(@Assisted val initialState: Wi
                                                   widgetPostAPIHandlerFactory: WidgetPostAPIHandler.Factory,
                                                   private val stringProvider: StringProvider,
                                                   private val session: Session) :
-    VectorViewModel<WidgetViewState, WidgetAction, WidgetViewEvents>(initialState),
+        VectorViewModel<WidgetViewState, WidgetAction, WidgetViewEvents>(initialState),
         WidgetPostAPIHandler.NavigationCallback,
         IntegrationManagerService.Listener {
 
diff --git a/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt
index 78871da324..7ab2cf174d 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt
@@ -37,7 +37,7 @@ import java.net.URL
 
 class RoomWidgetPermissionViewModel @AssistedInject constructor(@Assisted val initialState: RoomWidgetPermissionViewState,
                                                                 private val session: Session) :
-    VectorViewModel<RoomWidgetPermissionViewState, RoomWidgetPermissionActions, RoomWidgetPermissionViewEvents>(initialState) {
+        VectorViewModel<RoomWidgetPermissionViewState, RoomWidgetPermissionActions, RoomWidgetPermissionViewEvents>(initialState) {
 
     private val widgetService = session.widgetService()
     private val integrationManagerService = session.integrationManagerService()
diff --git a/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt b/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt
index 8fb5b27376..1c55145e16 100644
--- a/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt
@@ -87,7 +87,7 @@ class ServerBackupStatusViewModel @AssistedInject constructor(@Assisted initialS
         val liveCrossSigningPrivateKeys = session.flow().liveCrossSigningPrivateKeys()
         combine(liveUserAccountData, liveCrossSigningInfo, keyBackupFlow, liveCrossSigningPrivateKeys) { _, crossSigningInfo, keyBackupState, pInfo ->
             // first check if 4S is already setup
-            if (session.sharedSecretStorageService.isRecoverySetup()) {
+            if (session.sharedSecretStorageService().isRecoverySetup()) {
                 // 4S is already setup sp we should not display anything
                 return@combine when (keyBackupState) {
                     KeysBackupState.BackingUp -> BannerState.BackingUp
diff --git a/vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt
index fbc0b8fcff..79df62d7fb 100644
--- a/vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt
@@ -74,7 +74,7 @@ class SignoutCheckViewModel @AssistedInject constructor(
         session.cryptoService().keysBackupService().addListener(this)
         session.cryptoService().keysBackupService().checkAndStartKeysBackup()
 
-        val quad4SIsSetup = session.sharedSecretStorageService.isRecoverySetup()
+        val quad4SIsSetup = session.sharedSecretStorageService().isRecoverySetup()
         val allKeysKnown = session.cryptoService().crossSigningService().allPrivateKeysKnown()
         val backupState = session.cryptoService().keysBackupService().state
         setState {
@@ -88,7 +88,7 @@ class SignoutCheckViewModel @AssistedInject constructor(
 
         session.flow().liveUserAccountData(setOf(MASTER_KEY_SSSS_NAME, USER_SIGNING_KEY_SSSS_NAME, SELF_SIGNING_KEY_SSSS_NAME))
                 .map {
-                    session.sharedSecretStorageService.isRecoverySetup()
+                    session.sharedSecretStorageService().isRecoverySetup()
                 }
                 .distinctUntilChanged()
                 .execute {
diff --git a/vector/src/main/res/drawable/ic_feedback.xml b/vector/src/main/res/drawable/ic_feedback.xml
deleted file mode 100644
index e774a8ab5c..0000000000
--- a/vector/src/main/res/drawable/ic_feedback.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<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="M6.2887,10.748C8.7036,10.748 10.6612,8.7897 10.6612,6.374C10.6612,3.9583 8.7036,2 6.2887,2C3.8739,2 1.9163,3.9583 1.9163,6.374C1.9163,7.038 2.0642,7.6674 2.3288,8.2311L1.6,9.7683C1.2011,10.6099 2.0682,11.492 2.9165,11.1074L4.5258,10.378C5.0651,10.6159 5.6615,10.748 6.2887,10.748Z"
-      android:fillColor="#368BD6"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M12.6608,7.3739C12.6608,9.7896 10.7032,11.7479 8.2883,11.7479C7.8421,11.7479 7.4114,11.681 7.0059,11.5568C7.7732,12.2953 8.8076,12.7479 9.9456,12.7479C10.5605,12.7479 11.1451,12.6158 11.6737,12.3778L13.211,13.0887C14.0564,13.4796 14.9301,12.6043 14.5376,11.7597L13.8272,10.2308C14.0865,9.6672 14.2315,9.0378 14.2315,8.3739C14.2315,6.4535 13.0188,4.8221 11.3323,4.2339C12.1516,5.0289 12.6608,6.1419 12.6608,7.3739Z"
-      android:fillColor="#368BD6"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_secure_backup.xml b/vector/src/main/res/drawable/ic_secure_backup.xml
index 899bb8d2ae..78bb71e829 100644
--- a/vector/src/main/res/drawable/ic_secure_backup.xml
+++ b/vector/src/main/res/drawable/ic_secure_backup.xml
@@ -1,4 +1,5 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
@@ -8,13 +9,16 @@
         android:pathData="M1,2h21.5v5h-21.5zM1,17.7h21.5v5h-21.5z"/>
     <path
         android:pathData="M3.1663,12.4014C3.1663,7.6467 6.9953,3.8177 11.75,3.8177C13.0964,3.8177 14.4429,4.1544 15.6631,4.7435H14.9899C14.5691,4.7435 14.2325,5.0801 14.2325,5.5008C14.2325,5.9216 14.5691,6.2582 14.9899,6.2582H17.3041C17.809,6.2582 18.1877,5.8375 18.1877,5.3746V3.0604C18.1877,2.6396 17.8511,2.303 17.4303,2.303C17.0096,2.303 16.673,2.6396 16.673,3.0604V3.6074C16.6309,3.5653 16.5888,3.5653 16.5467,3.5232C15.074,2.7238 13.433,2.303 11.75,2.303C6.1958,2.303 1.6515,6.8473 1.6515,12.4014C1.6515,14.0845 2.0723,15.7676 2.8717,17.2403C2.998,17.4928 3.2504,17.619 3.545,17.619C3.6712,17.619 3.7974,17.5769 3.9236,17.5348C4.3023,17.3245 4.4286,16.8616 4.2182,16.525C3.5029,15.2627 3.1663,13.8321 3.1663,12.4014Z"
-        android:fillColor="#2E2F32"/>
+        android:fillColor="#2E2F32"
+        tools:fillColor="#FF0000"/>
     <path
         android:pathData="M20.6281,7.5626C20.4177,7.1839 19.9548,7.0577 19.6182,7.2681C19.2395,7.4785 19.1133,7.9413 19.3237,8.2779C19.9969,9.5402 20.3756,10.9288 20.3756,12.4015C20.3756,17.1562 16.5045,20.9852 11.7919,20.9852C10.4454,20.9852 9.099,20.6486 7.8787,20.0595H8.552C8.9727,20.0595 9.3094,19.7229 9.3094,19.3021C9.3094,18.8813 8.9727,18.5447 8.552,18.5447H6.2377C5.7328,18.5447 5.3541,18.9655 5.3541,19.4283V21.7426C5.3541,22.1633 5.6908,22.4999 6.1115,22.4999C6.5323,22.4999 6.8689,22.1633 6.8689,21.7426V21.1956C6.911,21.2376 6.9531,21.2376 6.9951,21.2797C8.4257,22.0792 10.0667,22.4999 11.7498,22.4999C17.304,22.4999 21.8483,17.9556 21.8483,12.4015C21.8483,10.7184 21.4275,9.0353 20.6281,7.5626Z"
-        android:fillColor="#2E2F32"/>
+        android:fillColor="#2E2F32"
+        tools:fillColor="#FF0000"/>
   </group>
   <path
       android:pathData="M3,9C1.8954,9 1,9.8954 1,11V14C1,15.1046 1.8954,16 3,16H21C22.1046,16 23,15.1046 23,14V11C23,9.8954 22.1046,9 21,9H3ZM5.25,10.5C4.8358,10.5 4.5,10.8358 4.5,11.25C4.5,11.6642 4.8358,12 5.25,12H7.75C8.1642,12 8.5,11.6642 8.5,11.25C8.5,10.8358 8.1642,10.5 7.75,10.5H5.25ZM9.5,11.25C9.5,10.8358 9.8358,10.5 10.25,10.5H10.75C11.1642,10.5 11.5,10.8358 11.5,11.25C11.5,11.6642 11.1642,12 10.75,12H10.25C9.8358,12 9.5,11.6642 9.5,11.25ZM13.25,10.5C12.8358,10.5 12.5,10.8358 12.5,11.25C12.5,11.6642 12.8358,12 13.25,12H15.75C16.1642,12 16.5,11.6642 16.5,11.25C16.5,10.8358 16.1642,10.5 15.75,10.5H13.25ZM17.5,11.25C17.5,10.8358 17.8358,10.5 18.25,10.5H18.75C19.1642,10.5 19.5,10.8358 19.5,11.25C19.5,11.6642 19.1642,12 18.75,12H18.25C17.8358,12 17.5,11.6642 17.5,11.25ZM5.25,13C4.8358,13 4.5,13.3358 4.5,13.75C4.5,14.1642 4.8358,14.5 5.25,14.5H5.75C6.1642,14.5 6.5,14.1642 6.5,13.75C6.5,13.3358 6.1642,13 5.75,13H5.25ZM7.5,13.75C7.5,13.3358 7.8358,13 8.25,13H10.75C11.1642,13 11.5,13.3358 11.5,13.75C11.5,14.1642 11.1642,14.5 10.75,14.5H8.25C7.8358,14.5 7.5,14.1642 7.5,13.75ZM13.25,13C12.8358,13 12.5,13.3358 12.5,13.75C12.5,14.1642 12.8358,14.5 13.25,14.5H13.75C14.1642,14.5 14.5,14.1642 14.5,13.75C14.5,13.3358 14.1642,13 13.75,13H13.25Z"
       android:fillColor="#2E2F32"
-      android:fillType="evenOdd"/>
+      android:fillType="evenOdd"
+      tools:fillColor="#FF0000"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_share_screen.xml b/vector/src/main/res/drawable/ic_share_screen.xml
new file mode 100644
index 0000000000..5e3caa6987
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_share_screen.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3.4,4C2.0745,4 1,5.0745 1,6.4V17.6C1,18.9255 2.0745,20 3.4,20H20.6C21.9255,20 23,18.9255 23,17.6V6.4C23,5.0745 21.9255,4 20.6,4H3.4ZM11.9999,16C11.6464,16 11.3599,15.7135 11.3599,15.36V10.2049L9.3841,12.2166C9.1364,12.4688 8.7348,12.4688 8.4872,12.2166C8.2395,11.9644 8.2395,11.5556 8.4872,11.3034L11.5514,8.1834C11.7991,7.9312 12.2007,7.9312 12.4484,8.1834L15.5126,11.3034C15.7603,11.5556 15.7603,11.9644 15.5126,12.2166C15.265,12.4688 14.8634,12.4688 14.6157,12.2166L12.6399,10.2049V15.36C12.6399,15.7135 12.3534,16 11.9999,16Z"
+      android:fillColor="#737D8C"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/layout/bottom_sheet_call_controls.xml b/vector/src/main/res/layout/bottom_sheet_call_controls.xml
index e751ac412a..516dc29fa3 100644
--- a/vector/src/main/res/layout/bottom_sheet_call_controls.xml
+++ b/vector/src/main/res/layout/bottom_sheet_call_controls.xml
@@ -7,6 +7,15 @@
     android:background="?colorSurface"
     android:orientation="vertical">
 
+    <im.vector.app.core.ui.views.BottomSheetActionButton
+        android:id="@+id/callControlsShareScreen"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:actionTitle="@string/call_start_screen_sharing"
+        app:leftIcon="@drawable/ic_share_screen"
+        app:tint="?vctr_content_primary"
+        app:titleTextColor="?vctr_content_primary" />
+
     <im.vector.app.core.ui.views.BottomSheetActionButton
         android:id="@+id/callControlsSwitchCamera"
         android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/fragment_ftue_account_created.xml b/vector/src/main/res/layout/fragment_ftue_account_created.xml
index 268a6d95ac..908c6c8a11 100644
--- a/vector/src/main/res/layout/fragment_ftue_account_created.xml
+++ b/vector/src/main/res/layout/fragment_ftue_account_created.xml
@@ -162,7 +162,7 @@
         app:layout_constraintHeight_percent="0.05"
         app:layout_constraintTop_toBottomOf="@id/ctaBottomBarrier" />
 
-    <nl.dionsegijn.konfetti.xml.KonfettiView
+    <im.vector.app.core.ui.views.CompatKonfetti
         android:id="@+id/viewKonfetti"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/vector/src/main/res/layout/fragment_ftue_personalization_complete.xml b/vector/src/main/res/layout/fragment_ftue_personalization_complete.xml
index f53724551f..8653d3f40d 100644
--- a/vector/src/main/res/layout/fragment_ftue_personalization_complete.xml
+++ b/vector/src/main/res/layout/fragment_ftue_personalization_complete.xml
@@ -106,7 +106,7 @@
         app:layout_constraintHeight_percent="0.05"
         app:layout_constraintTop_toBottomOf="@id/personalizationCompleteCta" />
 
-    <nl.dionsegijn.konfetti.xml.KonfettiView
+    <im.vector.app.core.ui.views.CompatKonfetti
         android:id="@+id/viewKonfetti"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/vector/src/main/res/layout/fragment_timeline.xml b/vector/src/main/res/layout/fragment_timeline.xml
index 1a47714b56..fcded76268 100644
--- a/vector/src/main/res/layout/fragment_timeline.xml
+++ b/vector/src/main/res/layout/fragment_timeline.xml
@@ -188,7 +188,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:tint="@android:color/black" />
 
-    <nl.dionsegijn.konfetti.xml.KonfettiView
+    <im.vector.app.core.ui.views.CompatKonfetti
         android:id="@+id/viewKonfetti"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/vector/src/main/res/layout/item_suggested_room.xml b/vector/src/main/res/layout/item_explore_space_child.xml
similarity index 88%
rename from vector/src/main/res/layout/item_suggested_room.xml
rename to vector/src/main/res/layout/item_explore_space_child.xml
index 23607c5c18..8f984e1b92 100644
--- a/vector/src/main/res/layout/item_suggested_room.xml
+++ b/vector/src/main/res/layout/item_explore_space_child.xml
@@ -58,7 +58,21 @@
         tools:text="@sample/users.json/data/displayName" />
 
     <TextView
-        android:id="@+id/suggestedRoomDescription"
+        android:id="@+id/suggestedTag"
+        style="@style/Widget.Vector.TextView.Caption"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:layout_marginEnd="8dp"
+        android:text="@string/space_suggested"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?vctr_content_secondary"
+        app:layout_constraintStart_toStartOf="@id/roomNameView"
+        app:layout_constraintTop_toBottomOf="@id/roomNameView" />
+
+    <TextView
+        android:id="@+id/roomDescription"
         style="@style/Widget.Vector.TextView.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -69,7 +83,7 @@
         android:textColor="?vctr_content_secondary"
         app:layout_constraintEnd_toStartOf="@id/joinSuggestedRoomButton"
         app:layout_constraintStart_toStartOf="@id/roomNameView"
-        app:layout_constraintTop_toBottomOf="@id/roomNameView"
+        app:layout_constraintTop_toBottomOf="@id/suggestedTag"
         tools:text="@sample/rooms.json/data/topic" />
 
     <Button
@@ -99,6 +113,7 @@
         android:id="@+id/roomBottomBarrier"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        app:barrierMargin="8dp"
         app:barrierDirection="bottom"
         app:constraint_referenced_ids="roomAvatarBottomSpace" />
 
diff --git a/vector/src/main/res/layout/item_profile_matrix_item.xml b/vector/src/main/res/layout/item_profile_matrix_item.xml
index c9354dec9a..85e3c2babb 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item.xml
@@ -64,7 +64,7 @@
         android:textColor="?vctr_content_primary"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toTopOf="@id/matrixItemSubtitle"
-        app:layout_constraintEnd_toStartOf="@id/matrixItemPowerLevelLabel"
+        app:layout_constraintEnd_toStartOf="@id/matrixItemIgnored"
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatarDecoration"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_goneMarginEnd="80dp"
@@ -83,12 +83,26 @@
         android:textColor="?vctr_content_secondary"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/matrixItemPowerLevelLabel"
+        app:layout_constraintEnd_toStartOf="@id/matrixItemIgnored"
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toBottomOf="@id/matrixItemTitle"
         app:layout_goneMarginEnd="8dp"
         tools:text="@sample/users.json/data/id" />
 
+    <ImageView
+        android:id="@+id/matrixItemIgnored"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="4dp"
+        android:importantForAccessibility="no"
+        android:src="@drawable/ic_settings_root_ignored_users"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/matrixItemPowerLevelLabel"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?colorError"
+        tools:visibility="visible" />
+
     <TextView
         android:id="@+id/matrixItemPowerLevelLabel"
         style="@style/Widget.Vector.TextView.Caption"
diff --git a/vector/src/main/res/layout/item_space_beta_header.xml b/vector/src/main/res/layout/item_space_beta_header.xml
index 943b5671ff..3ccc541371 100644
--- a/vector/src/main/res/layout/item_space_beta_header.xml
+++ b/vector/src/main/res/layout/item_space_beta_header.xml
@@ -8,6 +8,7 @@
     android:paddingStart="16dp"
     android:paddingTop="8dp"
     android:paddingEnd="16dp"
+    android:paddingBottom="16dp"
     tools:viewBindingIgnore="true">
 
     <TextView
@@ -27,18 +28,4 @@
         android:text="@string/spaces_beta_welcome_to_spaces_desc"
         android:textColor="?vctr_content_secondary" />
 
-    <TextView
-        android:id="@+id/spaceBetaFeedbackAction"
-        style="@style/Widget.Vector.TextView.Body"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:drawablePadding="8dp"
-        android:paddingStart="0dp"
-        android:paddingTop="8dp"
-        android:paddingEnd="16dp"
-        android:paddingBottom="8dp"
-        android:text="@string/give_feedback"
-        android:textColor="@color/vector_info_color"
-        app:drawableStartCompat="@drawable/ic_feedback" />
-
 </LinearLayout>
diff --git a/vector/src/main/res/menu/menu_timeline.xml b/vector/src/main/res/menu/menu_timeline.xml
index 45b3737019..8b1ea02a4a 100644
--- a/vector/src/main/res/menu/menu_timeline.xml
+++ b/vector/src/main/res/menu/menu_timeline.xml
@@ -1,7 +1,8 @@
 <?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">
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="AlwaysShowAction">
 
     <item
         android:id="@+id/timeline_setting"
@@ -19,24 +20,27 @@
         android:title="@string/action_invite"
         app:showAsAction="never" />
 
+    <!-- We always want to show this item as an icon -->
     <item
         android:id="@+id/video_call"
         android:icon="@drawable/ic_video"
         android:title="@string/action_video_call"
         android:visible="false"
         app:iconTint="?colorPrimary"
-        app:showAsAction="ifRoom"
+        app:showAsAction="always"
         tools:visible="true" />
 
+    <!-- We always want to show this item as an icon -->
     <item
         android:id="@+id/voice_call"
         android:icon="@drawable/ic_phone"
-        android:title="@string/call"
+        android:title="@string/action_voice_call"
         android:visible="false"
         app:iconTint="?colorPrimary"
-        app:showAsAction="ifRoom"
+        app:showAsAction="always"
         tools:visible="true" />
 
+    <!-- We always want to show this item as an icon -->
     <item
         android:id="@+id/menu_timeline_thread_list"
         android:title="@string/action_view_threads"
@@ -86,4 +90,4 @@
         android:title="@string/action_share"
         app:iconTint="?vctr_content_secondary"
         app:showAsAction="withText" />
-</menu>
\ No newline at end of file
+</menu>
diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
index 10c10b8062..1e619580f2 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -245,7 +245,7 @@
     <string name="action_remove">أزِل</string>
     <string name="action_join">انضم</string>
     <string name="action_reject">ارفض</string>
-    <string name="room_jump_to_first_unread">انتقل إلى أول رسالة غير مقروءة.</string>
+    <string name="room_jump_to_first_unread">انتقل إلى غير المقروءة.</string>
     <string name="room_participants_leave_prompt_title">ترك الغرفة</string>
     <string name="room_participants_leave_prompt_msg">أمتأكّد من ترك الغرفة؟</string>
     <string name="room_participants_action_ban">امنع</string>
@@ -253,7 +253,7 @@
     <string name="room_participants_action_ignore">أخفِ كل رسائل هذا المستخدم</string>
     <string name="room_participants_action_unignore">اعرض كل رسائل هذا المستخدم</string>
     <string name="room_one_user_is_typing">‏⁨%1$s⁩ يكتب…</string>
-    <string name="room_do_not_have_permission_to_post">لا تصريح لديك للنشر في هذه الغرفة</string>
+    <string name="room_do_not_have_permission_to_post">لا أذن لديك للنشر في هذه الغرفة.</string>
     <string name="ssl_logout_account">اخرج</string>
     <string name="ssl_fingerprint_hash">البصمة (⁨%s⁩):</string>
     <string name="ssl_could_not_verify">تعذّر التحقق من معرّف الخادوم البعيد.</string>
@@ -408,7 +408,7 @@
     <string name="room_participants_action_mention">أشِر إليه</string>
     <string name="room_participants_power_level_prompt">لن تستطيع العودة عن هذا التغيير إذ أنك تمنح المستخدم نفس مستوى السلطة الذي لك.
 أمتأكد؟</string>
-    <string name="room_participants_ban_prompt_msg">أمتأكد من منع هذا المستخدم من هذه الدردشة؟</string>
+    <string name="room_participants_ban_prompt_msg">حظر مستخدم عن هذه الغرفة سيمنعه من الانضمام إليها ثانية.</string>
     <string name="ssl_trust">ثِق</string>
     <string name="ssl_do_not_trust">لا تثق</string>
     <string name="ssl_remain_offline">تجاهل</string>
@@ -481,7 +481,7 @@
     <string name="encryption_information_not_verified">&lt;b&gt;غير&lt;b/&gt; مؤكّدة</string>
     <string name="encryption_information_verified">مؤكّدة</string>
     <string name="encryption_information_verify">أكّد</string>
-    <string name="list_members">اسرد الأعضاء</string>
+    <string name="list_members">أعضاء</string>
     <string name="room_participants_action_invite">ادعُ</string>
     <string name="ssl_cert_not_trust">قد يعني هذا بأن أحدهم يعترض الاتصال بعدوانية، أو أن هاتفك لا يثق بالشهادة التي قدّمها الخادوم البعيد.</string>
     <string name="ssl_cert_new_account_expl">إن قال مدير الخادوم بأن هذا متوقع، فتأكد من أن البصمة أدناه تطابق البصمة التي وفّرها.</string>
@@ -735,7 +735,7 @@
         <item quantity="many">%d مكالمةً فائة</item>
         <item quantity="other">%d مكالمة فائة</item>
     </plurals>
-    <string name="call_ringing">يتصل…</string>
+    <string name="call_ringing">يَرِن…</string>
     <string name="settings_call_ringtone_dialog_title">اختر نغمة للمكالمات:</string>
     <string name="settings_call_ringtone_title">نغمة المكالمات الواردة</string>
     <string name="settings_call_show_confirmation_dialog_summary">أكّد المكالمة قبل إجرائها</string>
@@ -872,4 +872,271 @@
     <string name="message_view_reaction">اعرض الانفعالات</string>
     <string name="message_add_reaction">أضف انفعالًا</string>
     <string name="title_activity_emoji_reaction_picker">الانفعالات</string>
+    <string name="decide_who_can_find_and_join">اختر من يمكنهم العثور على الغرفة والانضمام إليها.</string>
+    <string name="tap_to_edit_spaces">اضغط لتعديل الفضاءات</string>
+    <string name="select_spaces">اختر الفضاءات</string>
+    <string name="room_create_member_of_space_name_can_join">أعضاء فضاء %s يمكنهم العثور على الغرفة ومعاينتها والانضمام إليها.</string>
+    <string name="room_settings_room_access_restricted_title">أعضاء الفضاء فقك</string>
+    <string name="room_settings_space_access_public_description">يمكن لأي كان العثور على الفضاء والانضمام إليه</string>
+    <string name="room_settings_room_access_public_description">يمكن لأي كان الانضمام للغرفة</string>
+    <string name="room_settings_room_access_public_title">علنيّة</string>
+    <string name="room_settings_room_access_private_invite_only_title">خاصة (عبر الدعوة فقط)</string>
+    <string name="room_settings_room_access_private_title">خاصة</string>
+    <string name="settings_show_join_leave_messages">أظهر حدثيْ الانضمام والمغادرة</string>
+    <string name="settings_send_typing_notifs_summary">أعلم المستخدمين أنك تكتب.</string>
+    <string name="settings_send_typing_notifs">أرسل إخطارات عند الكتابة</string>
+    <string name="settings_cryptography_manage_keys">إدارة مفاتيح التعميّة</string>
+    <string name="settings_integrations">تَكامُل</string>
+    <plurals name="seconds">
+        <item quantity="zero">الآن</item>
+        <item quantity="one">ثانية واحدة</item>
+        <item quantity="two">ثانيتان</item>
+        <item quantity="few">%d ثوان</item>
+        <item quantity="many">%d ثانية</item>
+        <item quantity="other">%d ثانية</item>
+    </plurals>
+    <string name="login_server_url_form_other_hint">العنوان</string>
+    <string name="login_clear_homeserver_history">امسح التأريخ</string>
+    <string name="login_signin">لِج</string>
+    <string name="login_signup">سجّل</string>
+    <string name="login_signin_to">لج عبر %1$s</string>
+    <string name="login_connect_to_a_custom_server">اتص بخادم مخصص</string>
+    <string name="login_connect_to_modular">اتصل بخدمات مايتركس لـ Element</string>
+    <string name="login_connect_to">اتصل بـ %1$s</string>
+    <string name="login_continue">تابع</string>
+    <string name="login_social_signin_with">لِج عبر %s</string>
+    <string name="login_social_signup_with">سجل في %s</string>
+    <string name="login_social_continue_with">تابع بـ %s</string>
+    <string name="login_server_other_title">أخرى</string>
+    <string name="login_server_matrix_org_text">انضم لأكبر خادم علني مجانًا</string>
+    <string name="login_server_text">مثل البريد الالكتروني لن تحتاج سوى لحساب واحد للتواصل مع الجميع</string>
+    <string name="login_server_title">اختر خادمًا</string>
+    <string name="login_splash_already_have_account">لدي حساب سلفًا</string>
+    <string name="login_splash_create_account">أنشئ حسابًا</string>
+    <string name="login_splash_submit">ابدأ</string>
+    <string name="login_splash_text2">حافظ على خصوصية محادثاتك بالتعميّة</string>
+    <string name="login_splash_text1">تراسل مع أفراد أو مجموعات</string>
+    <string name="login_splash_title">تحكم في محادثاتك.</string>
+    <string name="ftue_personalize_skip_this_step">تخط هذه الخطوة</string>
+    <string name="ftue_personalize_submit">احفظ وتابع</string>
+    <string name="ftue_personalize_complete_subtitle">حُفظت تفضيلاتك.</string>
+    <string name="ftue_personalize_complete_title">كل شيئ جاهز!</string>
+    <string name="ftue_personalize_lets_go">لننطلق</string>
+    <string name="ftue_profile_picture_subtitle">يمكنك تغييرها في أي وقت.</string>
+    <string name="ftue_profile_picture_title">أضف صورة لللاحة</string>
+    <string name="ftue_display_name_entry_footer">يمكنك تغييره لاحقًا</string>
+    <string name="ftue_display_name_entry_title">الاسم العلني</string>
+    <string name="ftue_display_name_subtitle">سيظهر هذا الاسم مع رسائلك.</string>
+    <string name="ftue_display_name_title">اختر الاسم العلني</string>
+    <string name="ftue_account_created_subtitle">أُنشئ حسابك %s.</string>
+    <string name="ftue_account_created_congratulations_title">مبارك!</string>
+    <string name="ftue_account_created_take_me_home">انقلني للمنزل</string>
+    <string name="ftue_account_created_personalize">خصص لاحتك</string>
+    <string name="ftue_auth_use_case_connect_to_server">اتصل بخادم</string>
+    <string name="ftue_auth_use_case_join_existing_server">ترغب في الانضمام لخادم موجودٍ سلفًا؟</string>
+    <string name="ftue_auth_use_case_skip_partial">تخط هذا السؤال</string>
+    <string name="ftue_auth_use_case_option_three">مجتمعات</string>
+    <string name="ftue_auth_use_case_option_two">فِرق</string>
+    <string name="ftue_auth_use_case_option_one">الأصدقاء والعائلة</string>
+    <string name="ftue_auth_use_case_title">من أكثر من تحادثهم؟</string>
+    <string name="ftue_auth_carousel_encrypted_title">مراسلات آمنة.</string>
+    <string name="ftue_auth_carousel_control_title">أنت المتحكم.</string>
+    <string name="ftue_auth_carousel_secure_title">تحكم في محادثاتك.</string>
+    <string name="timeline_unread_messages">رسائل غير مقروءة</string>
+    <string name="room_join_rules_invite_by_you">جعلتَ الغرفة للمدعووين فقط.</string>
+    <string name="room_join_rules_invite">جعل %1$s الغرفة للمدعوين فقط.</string>
+    <string name="room_join_rules_public_by_you">جعلتَ الغرفة علنيّة لمن يملك رابطها.</string>
+    <string name="room_join_rules_public">جعل %1$s الغرفة علنيّة لمن يملك رابطها.</string>
+    <string name="help_long_click_on_room_for_more_options">اضغط مطولًا على الغرفة لتظهر مزيد من الخيارات</string>
+    <string name="no_ignored_users">لا تتجاهل أي مستخدم</string>
+    <string name="reaction_search_type_hint">اكتب كلمة مفتاحيّة لتعثر على تفاعل.</string>
+    <string name="notice_member_no_changes_by_you">لم تقم بأي تغيير</string>
+    <string name="notice_member_no_changes">لم يقم %1$s بأي تغيير</string>
+    <string name="room_list_quick_actions_room_settings">إعدادات الغرفة</string>
+    <string name="room_list_quick_actions_leave">غادر الغرفة</string>
+    <string name="room_list_quick_actions_favorite_remove">أزل من المفضلة</string>
+    <string name="room_list_quick_actions_favorite_add">أضف للمفضلة</string>
+    <string name="room_list_quick_actions_settings">الإعدادات</string>
+    <string name="room_list_quick_actions_notifications_mute">اكتم</string>
+    <string name="room_list_quick_actions_notifications_mentions">الذكر فقط</string>
+    <string name="room_list_quick_actions_notifications_all">كل الرسائل</string>
+    <string name="room_list_quick_actions_notifications_all_noisy">كل الرسائل (مزعج)</string>
+    <string name="message_ignore_user">تجاهل مستخدم</string>
+    <string name="login_social_continue">أَو</string>
+    <string name="room_alias_published_alias_main">هذا العنوان الرئيسي</string>
+    <string name="room_alias_published_alias_title">العناوين المنشورة</string>
+    <string name="space_settings_alias_title">عناوين الفضاء</string>
+    <string name="room_settings_alias_title">عناوين الغرفة</string>
+    <string name="room_settings_guest_access_title">اسمح للزوار الانضمام</string>
+    <string name="room_settings_space_access_title">النفاذ للفضاء</string>
+    <string name="room_settings_room_access_title">النفاذ للغرفة</string>
+    <string name="room_settings_access_rules_pref_dialog_title">من له النفاذ؟</string>
+    <string name="room_settings_room_notifications_account_settings">إعدادات الحساب</string>
+    <string name="room_settings_room_notifications_manage_notifications">يمكنك إدارة الإخطارات في %1$s.</string>
+    <string name="room_settings_room_notifications_notify_me">أخطرني بـ</string>
+    <string name="verify_new_session_was_not_me">لم أكن أنا</string>
+    <string name="verify_new_session_notice">استعمل هذه الجلسة لاستيثاق جلسة جديدة، مما يمنحها نفاذًا للرسائل المعماة.</string>
+    <string name="new_session">ولوج جديد، أنت من قمت به؟</string>
+    <string name="refresh">أنعش</string>
+    <string name="e2e_use_keybackup">فك قفل تأريخ الرسائل المعماة</string>
+    <string name="keys_backup_restore_success_title_already_up_to_date">المفاتيح محدثة سلفًا!</string>
+    <string name="encryption_settings_manage_message_recovery_summary">أدر النسخ الاحتياكي للمفاتيح</string>
+    <string name="encryption_message_recovery">استعادة الرسائل المعماة</string>
+    <string name="encryption_exported_successfully">نجح استيراد المفاتيح</string>
+    <string name="room_settings_enable_encryption_dialog_title">أتريد تفعيل التعميّة؟</string>
+    <string name="room_settings_enable_encryption_no_permission">ليس لديك إذن لتفعيل التعميّة في هذه الغرفة.</string>
+    <string name="settings_category_composer">محرر الرسائل</string>
+    <string name="command_description_rainbow">يرسل الرسالة المعطاة ملونة بألوان قوس قزح</string>
+    <string name="rendering_event_error_exception">${app_name} واجه مشكلة في تصيير الحدث ذو المعرف \'%1$s\'</string>
+    <string name="rendering_event_error_type_of_event_not_handled">${app_name} لا يستطيع التعامل مع ملفات من نوع \'%1$s\'</string>
+    <string name="room_member_open_or_create_dm">رسالة مباشرة</string>
+    <string name="room_member_power_level_moderator_in">مشرف لـ %1$s</string>
+    <string name="room_member_power_level_admin_in">مدير لـ %1$s</string>
+    <string name="room_member_power_level_users">المستخدمون</string>
+    <string name="room_member_power_level_invites">الدعوات</string>
+    <string name="room_member_power_level_custom">مخصص</string>
+    <string name="room_member_power_level_moderators">المشرفون</string>
+    <string name="room_member_power_level_admins">المديرون</string>
+    <string name="room_profile_leaving_room">يغادر الغرفة.…</string>
+    <string name="direct_room_profile_section_more_leave">غادر</string>
+    <string name="room_profile_section_more_leave">غادر الغرفة</string>
+    <string name="room_profile_section_more_uploads">المرفوعات</string>
+    <string name="navigate_to_thread_when_already_in_the_thread">أنت تستعرض هذا النقاش سلفًا!</string>
+    <string name="navigate_to_room_when_already_in_the_room">أنت تستعرض هذه الغرفة سلفًا!</string>
+    <string name="error_no_network">منفصل عن الشبكة. تحقق من اتصالك.</string>
+    <string name="event_redacted_by_admin_reason">حدث عالجه مدير الغرفة.</string>
+    <string name="room_list_rooms_empty_body">ستعرض غرفك هنا. لانضمام لغرفة أو لإنشاء واحدة اضغط زر +.</string>
+    <string name="room_list_people_empty_body">ستعرض رسائلك المباشرة هنا. لبدأ محادثات جديدة اضغط زر +.</string>
+    <string name="room_list_people_empty_title">المحادثات</string>
+    <string name="room_list_rooms_empty_title">الغُرف</string>
+    <string name="room_list_catchup_empty_body">جميع الريائل مقروءة</string>
+    <string name="invited_by">دعاه %s</string>
+    <string name="send_you_invite">أرسلَ لك طلبًا</string>
+    <string name="global_retry">أعد المحاولة</string>
+    <string name="view_in_room">اعرضه في الغرفة</string>
+    <string name="reply">ردّ</string>
+    <string name="edit">حرّر</string>
+    <string name="sas_error_unknown">خطأ مجهول</string>
+    <string name="sas_incoming_request_notif_content">يريد %s التحقق من جلستك</string>
+    <string name="sas_incoming_request_notif_title">طلب تحقق</string>
+    <string name="sas_got_it">فهمتُ</string>
+    <string name="sas_verified">مستوثق!</string>
+    <string name="keys_backup_info_title_signature">التوقيع</string>
+    <string name="keys_backup_info_title_algorithm">الخوارزمية</string>
+    <string name="keys_backup_info_title_version">النسخة</string>
+    <string name="keys_backup_settings_checking_backup_state">يتحقق من حالة النسخ الاحتياطي</string>
+    <string name="keys_backup_settings_restore_backup_button">استعد من نسخ احتياطي</string>
+    <string name="room_permissions_title">الأذونات</string>
+    <string name="space_settings_permissions_title">أذونات الفضاء</string>
+    <string name="room_settings_permissions_title">أذونات الغرفة</string>
+    <string name="room_notification_more_than_two_users_are_typing">%1$s و%2$s وآخرون</string>
+    <string name="room_notification_two_users_are_typing">%1$s و%2$s</string>
+    <string name="space_participants_unban_prompt_msg">فك الحظر عن مستخدم سيمح له الانضمام لهذا الفضاء.</string>
+    <string name="room_participants_unban_prompt_msg">فك الحظر عن مستخدم سيمح له الانضمام لهذه الغرفة.</string>
+    <string name="space_participants_ban_prompt_msg">حظر مستخدم عن هذه الفضاء سيمنعه من الانضمام إليه ثانية.</string>
+    <string name="room_participants_unban_title">فك حظر مستخدم</string>
+    <string name="room_participants_ban_reason">سبب الحظر</string>
+    <string name="room_participants_ban_title">احظر مستخدمًا</string>
+    <string name="space_participants_remove_prompt_msg">سيزال المستخدم من هذه الفضاء.
+\n
+\nلمنعه من الانضمام ثانية لهذه الفضاء احظره.</string>
+    <string name="room_participants_remove_prompt_msg">سيزال المستخدم من هذه الغرفة.
+\n
+\nلمنعه من الانضمام ثانية لهذه الغرفة احظره.</string>
+    <string name="room_participants_remove_reason">سبب الإزالة</string>
+    <string name="room_participants_remove_title">أزل مستخدمًا</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">أمتأكد من سحب دعوة هذا المستخدم؟</string>
+    <string name="room_participants_action_cancel_invite_title">اسحب الدعوة</string>
+    <string name="room_participants_action_unignore_title">ألغ تجاهل المستخدم</string>
+    <string name="room_participants_action_ignore_prompt_msg">بتجاهل هذا المستخدم ستزال الرسائل من الغرف المشتركة بينكما.
+\n
+\nيمكنم التراجع عن هذا الإجراء في أي وقت عبر الإعدادات العامة.</string>
+    <string name="room_participants_action_ignore_title">تجاهل مستخدم</string>
+    <string name="room_participants_power_level_demote">اخفض الرتبة</string>
+    <string name="room_participants_power_level_demote_warning_prompt">لن تتمكن من التراجع عن هذا التغيير لأنك ستخفض رتبتك ، إذا كنت آخر مستخدم ذي امتياز في الغرفة ، فسيكون من المستحيل استعادة الامتيازات.</string>
+    <string name="room_participants_power_level_demote_warning_title">أتريد خفض رتبتك؟</string>
+    <string name="room_participants_action_cancel_invite">اسحب الدعوة</string>
+    <string name="room_participants_leave_private_warning">هذه الغرفة ليست علنية، لا يمكنك إعادة الانضمام إليها بدون دعوة.</string>
+    <string name="permissions_denied_add_contact">امنح اذن النفاذ للمتراسلين.</string>
+    <string name="permissions_denied_qr_code">لمسح رمز الاستحابة السريعة اسمح بالنفاذ للكاميرا.</string>
+    <string name="video_call_in_progress">تجري مكالمة مرئية…</string>
+    <plurals name="missed_video_call">
+        <item quantity="zero">لا مكالمات مرئية فائتة</item>
+        <item quantity="one">مكالمة مرئية فائتة</item>
+        <item quantity="two">مكالمتان مرئيتان فائتتان</item>
+        <item quantity="few">%d مكالمات مرئية فائتة</item>
+        <item quantity="many">%d مكالمة مرئية فائتة</item>
+        <item quantity="other">%d مكالمة مرئية فائتة</item>
+    </plurals>
+    <string name="settings_call_ringtone_use_app_ringtone">استخدم نغمة ${app_name} الافتراضية للمكالمات الواردة</string>
+    <string name="settings_call_show_confirmation_dialog_title">امنع المكالمات العَرضية</string>
+    <string name="action_learn_more">استزد</string>
+    <string name="action_change">عدّل</string>
+    <string name="action_try_it_out">جربه</string>
+    <string name="action_not_now">ليس الآن</string>
+    <string name="action_disable">عطّل</string>
+    <string name="action_enable">فعّل</string>
+    <string name="cannot_call_yourself_with_invite">لا يمكنك إجراء مكالمة مع نفسك، انتظر قبول منتسبين لطلب</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">شغّلتّ التعمية بين الطرفيات (خورزمية مجهولة %1$s).</string>
+    <string name="settings_background_fdroid_sync_mode">وضع المزامنة في الخلفية</string>
+    <string name="settings_mentions_and_keywords_encryption_notice">على الهاتف لن تتلق إخطارات عند ذكرك أو ذكر كلمة مفتاحية في الغرف المعماة.</string>
+    <string name="settings_room_upgrades">ترقيات الغرف</string>
+    <string name="settings_messages_by_bot">رسائل آلي (Bot)</string>
+    <string name="settings_messages_containing_keywords">الكلمات المفتاحيّة</string>
+    <string name="settings_mentions_at_room">\@room</string>
+    <string name="settings_encrypted_direct_messages">الرسائل المباشرة المعماة</string>
+    <string name="settings_messages_direct_messages">الرسائل المباشرة</string>
+    <string name="settings_messages_containing_username">اسم المستخدم</string>
+    <string name="settings_messages_containing_display_name">اسمي العلني</string>
+    <string name="settings_when_rooms_are_upgraded">عند ترقية الغرف</string>
+    <string name="settings_messages_in_e2e_group_chat">الرسائل المعماة في المحادثات الجماعية</string>
+    <string name="settings_messages_in_e2e_one_to_one">الرسائل المعماة في المحادثات الفردية</string>
+    <string name="settings_system_preferences_summary">اختر لون ضوء التنبيهوالاهتزاز والصوت…</string>
+    <string name="settings_silent_notifications_preferences">اضبط الإخطارات الصامتة</string>
+    <string name="settings_call_notifications_preferences">اضبط إخطارات المكالمات</string>
+    <string name="settings_troubleshoot_test_battery_quickfix">تجاهل التحسين</string>
+    <string name="settings_troubleshoot_test_battery_success">يأثر تحسين البطارية على عمل ${app_name}.</string>
+    <string name="settings_troubleshoot_test_battery_title">تحسين البطارية</string>
+    <string name="settings_troubleshoot_test_bg_restricted_quickfix">عطّل القيود</string>
+    <string name="settings_troubleshoot_test_service_boot_title">ابدأ مع التشغيل</string>
+    <string name="settings_troubleshoot_test_service_boot_quickfix">فعّل البدأ مع التشغيل</string>
+    <string name="settings_troubleshoot_test_service_boot_success">ستبدأ الخدمة عند إعادة تشغيل الجهاز.</string>
+    <string name="settings_troubleshoot_test_notification_notification_clicked">نُقر الإخطار!</string>
+    <string name="settings_troubleshoot_test_notification_notice">رجاء أنقر على الإخطارات، إن لم تستطع رؤيتها تحقق من إعدادات النظام.</string>
+    <string name="settings_troubleshoot_test_notification_title">عرض الإخطارات</string>
+    <string name="settings_troubleshoot_test_push_notification_content">أنت تستعرض الإخطارات! أنقرني!</string>
+    <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">أضف حسابًا</string>
+    <string name="room_settings_room_access_private_description">يمكن للمدعووين فقط العثور على الغرفة والانضمام إليها</string>
+    <string name="room_settings_room_access_entry_unknown">إعداد نفاذ مجهول (%s)</string>
+    <string name="room_settings_room_access_entry_knock">يمكن لأي شخص طلب الانضمام لهذه الغرفة ليحدد الأعضاء إن كانوا سيقبلونهم أو يرفضونهم</string>
+    <string name="room_alias_publish_to_directory">أتريد نشر هذه الغرفة للعلن في دليل %1$s؟</string>
+    <string name="room_alias_action_unpublish">ألغ نشر هذا العنوان</string>
+    <string name="room_alias_action_publish">انشر هذا العنوان</string>
+    <string name="room_alias_local_address_add">أضف عنوانًا محليًا</string>
+    <string name="room_alias_local_address_empty">لا تملك هذه الغرفة عناوين محلية</string>
+    <string name="room_alias_local_address_title">العناوين المحلية</string>
+    <string name="room_alias_delete_confirmation">أتريد حذف العنوان \"%1$s\" ؟</string>
+    <string name="room_alias_unpublish_confirmation">أتريد إلغاء تشر العنوان \"%1$s\" ؟</string>
+    <string name="room_alias_published_alias_add_manually_submit">انشر</string>
+    <string name="settings_presence">الحظور</string>
+    <string name="media_source_choose">اختر</string>
+    <string name="settings_default_media_source">المصدر الافتراضي للوسائط</string>
+    <string name="compression_opt_list_choose">اختر</string>
+    <string name="settings_media">الوسائط</string>
+    <string name="settings_emails_and_phone_numbers_summary">أدر البريد الإلكتروني وأرقام الهاتف المرتبطة بحسابك</string>
+    <string name="settings_emails_and_phone_numbers_title">البريد الإلكتروني وأرقام الهاتف</string>
+    <string name="settings_fail_to_update_password_invalid_current_password">كلمة السر غير صالحة</string>
+    <string name="settings_password">كلمة السر</string>
+    <string name="room_no_active_widgets">لا ودجات نشطة</string>
+    <string name="room_widget_webview_access_microphone">استخدم المايكروفون</string>
+    <string name="room_widget_webview_access_camera">استخدم الكاميرا</string>
+    <string name="room_widget_resource_decline_permission">احجب الكل</string>
+    <string name="room_widget_resource_grant_permission">اسمح</string>
+    <string name="room_widget_permission_room_id">معرف الغرفة</string>
+    <string name="room_widget_permission_widget_id">معرف الودجة</string>
+    <string name="room_widget_permission_theme">سمتك</string>
+    <string name="room_widget_permission_user_id">معرفك</string>
+    <string name="room_widget_permission_avatar_url">رابط صورتك الرمزية</string>
+    <string name="room_widget_permission_display_name">اسمك العلني</string>
+    <string name="room_widget_open_in_browser">افتح في المتصفح</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-bn/strings.xml b/vector/src/main/res/values-bn/strings.xml
new file mode 100644
index 0000000000..8555330f05
--- /dev/null
+++ b/vector/src/main/res/values-bn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="notice_room_invite_no_invitee">%s এর আমন্ত্রণ</string>
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index c66ff56b3e..61be21b7bf 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -1566,7 +1566,9 @@
 \n
 \nMůžete tuto akci kdykoli zvrátit v obecných nastaveních.</string>
     <string name="room_participants_action_unignore_title">Odignorovat uživatele</string>
-    <string name="room_participants_action_unignore_prompt_msg">Odignorování tohoto uživatele opět ukáže všechny jejich zprávy.</string>
+    <string name="room_participants_action_unignore_prompt_msg">Zrušení ignorování tohoto uživatele opět ukáže všechny jejich zprávy.
+\n
+\nTato akce povede k restartování aplikace a může trvat nějakou dobu.</string>
     <string name="room_participants_action_cancel_invite_title">Zrušit pozvánku</string>
     <string name="room_participants_action_cancel_invite_prompt_msg">Jste si jisti, že chcete zrušit pozvánku tomuto uživateli\?</string>
     <string name="room_participants_remove_title">Vykopnout uživatele</string>
@@ -2485,4 +2487,51 @@
 \n
 \nPůjde o jednorázový přechod, protože vlákna jsou nyní součástí Matrix specifikace.</string>
     <string name="threads_notice_migration_title">Vlákna se blíží k betaverzi 🎉</string>
+    <string name="live_location_sharing_notification_description">Probíhá sdílení polohy</string>
+    <string name="live_location_sharing_notification_title">${app_name} poloha živě</string>
+    <string name="error_forbidden_digits_only_username">Domovský server neakceptuje uživatelská jména obsahující pouze číslice.</string>
+    <string name="ftue_personalize_skip_this_step">Přeskočit tento krok</string>
+    <string name="ftue_personalize_submit">Uložit a pokračovat</string>
+    <string name="ftue_personalize_complete_subtitle">Vaše předvolby byly uloženy.</string>
+    <string name="ftue_personalize_complete_title">Vše je připraveno!</string>
+    <string name="ftue_personalize_lets_go">Jdeme na to</string>
+    <string name="ftue_profile_picture_subtitle">Tuto můžete kdykoli změnit.</string>
+    <string name="ftue_profile_picture_title">Přidat profilový obrázek</string>
+    <string name="ftue_display_name_entry_footer">Později to můžete změnit</string>
+    <string name="ftue_display_name_entry_title">Zobrazované jméno</string>
+    <string name="ftue_display_name_subtitle">Toto se zobrazí při odesílání zpráv.</string>
+    <string name="ftue_display_name_title">Zvolte si zobrazované jméno</string>
+    <string name="ftue_account_created_subtitle">Váš účet %s byl založen.</string>
+    <string name="ftue_account_created_congratulations_title">Gratulujeme!</string>
+    <string name="ftue_account_created_take_me_home">Vezmi mě domů</string>
+    <string name="ftue_account_created_personalize">Přizpůsobit profil</string>
+    <string name="action_disable">Zakázat</string>
+    <string name="location_share_live_started">Načítání polohy živě…</string>
+    <string name="location_share_live_select_duration_option_3">8 hodin</string>
+    <string name="location_share_live_select_duration_option_2">1 hodinu</string>
+    <string name="location_share_live_select_duration_option_1">15 minut</string>
+    <string name="location_share_live_select_duration_title">Sdílet svoji polohu živě na</string>
+    <string name="audio_message_file_size">(%1$s)</string>
+    <string name="audio_message_reply_content">%1$s (%2$s)</string>
+    <string name="error_audio_message_unable_to_play">Nelze přehrát %1$s</string>
+    <string name="a11y_pause_audio_message">Pozastavit %1$s</string>
+    <string name="a11y_play_audio_message">Přehrát %1$s</string>
+    <string name="a11y_audio_playback_duration">%1$d minut %2$d sekund</string>
+    <string name="a11y_audio_message_item">%1$s, %2$s, %3$s</string>
+    <string name="sent_live_location">Sdíleli svou polohu živě</string>
+    <string name="ftue_auth_carousel_workplace_body">${app_name} se skvěle hodí i na pracoviště. Aplikaci důvěřují nejlépe zabezpečené organizace na světě.</string>
+    <string name="beta">BETA</string>
+    <string name="send_feedback_threads_info">Vlákna jsou ve fázi vývoje s novými zajímavými funkcemi, jako jsou například vylepšená oznámení. Rádi si vyslechneme vaši zpětnou vazbu!</string>
+    <string name="send_feedback_threads_title">Zpětná vazba k vláknům Beta</string>
+    <string name="give_feedback_threads">Poskytnout zpětnou vazbu</string>
+    <string name="beta_title_bottom_sheet_action">BETA</string>
+    <string name="settings_presence_user_always_appears_offline_summary">Pokud je tato funkce povolena, budete se ostatním uživatelům vždy jevit jako offline, a to i při používání aplikace.</string>
+    <string name="settings_presence_user_always_appears_offline">Režim offline</string>
+    <string name="settings_presence">Přítomnost</string>
+    <string name="threads_labs_enable_notice_message">Váš domovský server v současné době vlákna nepodporuje, takže tato funkce může být nespolehlivá. Některé zprávy ve vláknech nemusí být spolehlivě dostupné. %sChcete přesto vlákna povolit\?</string>
+    <string name="threads_labs_enable_notice_title">Vlákna Beta</string>
+    <string name="threads_beta_enable_notice_message">Vlákna pomáhají udržovat konverzace k tématu a snadno je sledovat. %sPovolením vláken se aplikace restartuje. U některých účtů to může trvat déle.</string>
+    <string name="threads_beta_enable_notice_title">Vlákna Beta</string>
+    <string name="action_learn_more">Zjistit více</string>
+    <string name="action_try_it_out">Vyzkoušet to</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 866f05b3a6..d463276bb1 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2428,4 +2428,5 @@
     <string name="a11y_location_share_option_user_live_icon">Live-Standort teilen</string>
     <string name="location_share_option_user_live">Live-Standort teilen</string>
     <string name="threads_notice_migration_title">Threads nähern sich der Beta 🎉</string>
+    <string name="action_disable">Deaktivieren</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index 0f80bc8e0f..a4ab637dae 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="notice_room_invite_no_invitee">la invitación de %s</string>
     <string name="notice_room_invite">%1$s invitó a %2$s</string>
     <string name="notice_room_invite_you">%1$s te ha invitado</string>
@@ -317,7 +317,7 @@
     <string name="action_remove">Eliminar</string>
     <string name="action_join">Unirse</string>
     <string name="action_reject">Rechazar</string>
-    <string name="room_jump_to_first_unread">Mensajes no leídos.</string>
+    <string name="room_jump_to_first_unread">Ir a mensajes no leídos</string>
     <string name="room_participants_leave_prompt_title">Salir de la sala</string>
     <string name="room_participants_leave_prompt_msg">¿Seguro que quieres salir de la sala?</string>
     <string name="room_participants_header_direct_chats">CONVERSACIONES DIRECTAS</string>
@@ -332,7 +332,7 @@
     <string name="room_one_user_is_typing">%s está escribiendo…</string>
     <string name="room_two_users_are_typing">%1$s y %2$s están escribiendo…</string>
     <string name="room_many_users_are_typing">%1$s y %2$s y otros están escribiendo…</string>
-    <string name="room_do_not_have_permission_to_post">No tienes permiso para publicar en esta sala</string>
+    <string name="room_do_not_have_permission_to_post">No tienes permiso para publicar en esta sala.</string>
     <string name="ssl_trust">Confiar</string>
     <string name="ssl_do_not_trust">No confiar</string>
     <string name="ssl_logout_account">Cerrar Sesión</string>
@@ -574,7 +574,7 @@
     <string name="command_description_unban_user">Quita el veto al usuario con la ID dada</string>
     <string name="command_description_op_user">Define el nivel de autoridad de un usuario</string>
     <string name="command_description_invite_user">Invita al usuario con la ID dada a la sala actual</string>
-    <string name="command_description_join_room">Se une a la sala con el alias dado</string>
+    <string name="command_description_join_room">Se une a la sala con la dirección dada</string>
     <string name="command_description_part_room">Salir de la sala</string>
     <string name="command_description_topic">Establecer el tema de la sala</string>
     <string name="command_description_remove_user">Expulsa al usuario con la ID dada</string>
@@ -582,7 +582,7 @@
     <string name="command_description_markdown">Activar/Desactivar markdown</string>
     <string name="command_description_clear_scalar_token">Para reparar la gestión de las Aplicaciones de Matrix</string>
     <string name="settings_preview_media_before_sending">Vista previa de medios antes de enviar</string>
-    <string name="room_tombstone_versioned_description">Esta sala ha sido reemplazada y ya no está activa</string>
+    <string name="room_tombstone_versioned_description">Esta sala ha sido reemplazada y ya no está activa.</string>
     <string name="room_tombstone_continuation_link">La conversación continúa aquí</string>
     <string name="room_tombstone_continuation_description">Esta sala es una continuación de otra conversación</string>
     <string name="room_tombstone_predecessor_link">Haz clic aquí para ver mensajes más antiguos</string>
@@ -972,7 +972,7 @@
     <string name="room_filtering_footer_create_new_direct_message">Enviar un nuevo mensaje directo</string>
     <string name="room_filtering_footer_open_room_directory">Ver el directorio de la sala</string>
     <string name="room_directory_search_hint">Nombre o ID (#ejemplo:servidor.org)</string>
-    <string name="labs_swipe_to_reply_in_timeline">Habilitar \"desplazar para contestar\" en la línea de tiempo</string>
+    <string name="labs_swipe_to_reply_in_timeline">Habilitar \"deslizar para contestar\" en la línea de tiempo</string>
     <string name="link_copied_to_clipboard">Enlace copiado al portapapeles</string>
     <string name="creating_direct_room">Creando sala…</string>
     <string name="message_view_edit_history">Ver historial de modificaciones</string>
@@ -1306,7 +1306,9 @@
 \n
 \n Puede revertir esta acción en cualquier momento en la configuración general.</string>
     <string name="room_participants_action_unignore_title">Dejar de ignorar al usuario</string>
-    <string name="room_participants_action_unignore_prompt_msg">Si ignora a este usuario, se mostrarán todos sus mensajes nuevamente.</string>
+    <string name="room_participants_action_unignore_prompt_msg">Si deja de ignorar a este usuario, se mostrarán todos sus mensajes nuevamente.
+\n
+\nTome nota de que esta acción reiniciará la aplicación y podría tardar algún tiempo.</string>
     <string name="room_participants_action_cancel_invite_prompt_msg">¿Estás seguro de que deseas cancelar la invitación de este usuario\?</string>
     <string name="room_participants_remove_title">Patear usuario</string>
     <string name="room_participants_remove_prompt_msg">patear al usuario los eliminará de esta sala.
@@ -1482,7 +1484,7 @@
     <string name="room_settings_enable_encryption_dialog_content">Una vez habilitado, el cifrado de una sala no se puede deshabilitar. Los mensajes enviados en una sala cifrada no pueden ser vistos por el servidor, solo por los participantes de la sala. Habilitar el cifrado puede impedir que muchos bots y puentes funcionen correctamente.</string>
     <string name="verification_request_notice">Para estar seguro, verifique %s comprobando un código de un solo uso.</string>
     <string name="verification_request_start_notice">Para estar seguro, hágalo en persona o use otra forma de comunicarse.</string>
-    <string name="verification_emoji_notice">Compare los emoji únicos, asegurándose de que aparezcan en el mismo orden.</string>
+    <string name="verification_emoji_notice">Verifica si los mismos emojis aparecen en el mismo orden en ambos usuarios.</string>
     <string name="verification_code_notice">Compare el código con el que se muestra en la pantalla del otro usuario.</string>
     <string name="verification_conclusion_ok_notice">Los mensajes con este usuario están cifrados Extremo-a-Extremo y no pueden ser leídos por terceros.</string>
     <string name="verification_conclusion_ok_self_notice">Su nueva sesión ahora está verificada. Tiene acceso a sus mensajes cifrados y otros usuarios lo verán como de confianza.</string>
@@ -1505,7 +1507,7 @@
     <string name="verification_profile_device_verified_because">Esta sesión es de confianza para mensajería segura porque %1$s (%2$s) la ha verificado:</string>
     <string name="verification_profile_device_new_signing">%1$s (%2$s) iniciado sesión con una nueva sesión:</string>
     <string name="verification_profile_device_untrust_info">Hasta que este usuario confíe en esta sesión, los mensajes enviados hacia y desde ella se etiquetan con advertencias. Alternativamente, puede verificarlo manualmente.</string>
-    <string name="qr_code_scanned_by_other_notice">¡Casi ahí! ¿Es %s muestra el mismo escudo\?</string>
+    <string name="qr_code_scanned_by_other_notice">¡Casi estamos! ¿Muestra %s el mismo tick\?</string>
     <string name="verification_cannot_access_other_session">Use una contraseña o clave de recuperación</string>
     <string name="verification_use_passphrase">Si no puede acceder a una sesión existente</string>
     <string name="enter_secret_storage_invalid">No puedo encontrar secretos almacenados</string>
@@ -1560,7 +1562,7 @@
     <string name="encryption_not_enabled">Cifrado no habilitado</string>
     <string name="encryption_unknown_algorithm_tile_description">El cifrado usado por esta sala no es compatible</string>
     <string name="room_created_summary_item">%s creado y configurado la sala.</string>
-    <string name="qr_code_scanned_self_verif_notice">¡Casi ahí! ¿El otro dispositivo muestra el mismo escudo\?</string>
+    <string name="qr_code_scanned_self_verif_notice">¡Casi estamos! ¿El otro dispositivo muestra el mismo tick\?</string>
     <string name="qr_code_scanned_verif_waiting_notice">¡Casi ahí! Esperando confirmación…</string>
     <string name="error_failed_to_import_keys">No se pudieron importar las claves</string>
     <string name="settings_messages_at_room">Mensajes que contienen @room</string>
@@ -1822,8 +1824,8 @@
     <string name="call_resume_action">Continuar</string>
     <string name="spaces_beta_welcome_to_spaces_desc">Los espacios son una nueva manera para agrupar salas y personas.</string>
     <string name="join_space">Únete a un Espacio</string>
-    <string name="create_space">Crea un Espacio</string>
-    <string name="add_space">Añade un Espacio</string>
+    <string name="create_space">Crear espacio</string>
+    <string name="add_space">Añadir espacio</string>
     <string name="command_description_create_space">Crea un Espacio</string>
     <string name="activity_create_space_title">Crear un espacio</string>
     <string name="initial_sync_start_server_computing">Sincronización inicial:
@@ -1991,7 +1993,7 @@
     <string name="room_settings_room_access_private_description">Solo la gente invitada puede encontrar y unirse a l sala</string>
     <string name="room_settings_room_access_private_invite_only_title">Privada (solo mediante invitación)</string>
     <string name="room_settings_room_access_entry_knock">Cualquiera puede solicitar entrar en la sala, serán los miembros quienes decidan aceptar o rechazar la solicitud</string>
-    <string name="room_alias_local_address_subtitle">Configurar las direcciones para esta sala de forma que otros usuarios puedan encontrarla mediante tu homeserver (%1$s).</string>
+    <string name="room_alias_local_address_subtitle">Configurar las direcciones para esta sala de forma que otros usuarios puedan encontrarla mediante tu servidor doméstico (%1$s)</string>
     <string name="room_alias_address_empty_can_add">Ninguna dirección publicada aún, añade una debajo.</string>
     <string name="room_alias_published_alias_subtitle">Las direcciones publicadas pueden ser usadas por cualquiera en cualquier servidor para unirse a tu sala. Para publicar una dirección es necesario configurarla previamente como dirección local.</string>
     <string name="space_settings_alias_subtitle">Ver y gestionar direcciones de este espacio.</string>
@@ -2018,7 +2020,7 @@
         <item quantity="one">Llamada de audio perdida</item>
         <item quantity="other">%d llamadas de audio perdidas</item>
     </plurals>
-    <string name="hs_client_url">Homeserver API URL</string>
+    <string name="hs_client_url">URL de API del servidor doméstico</string>
     <string name="missing_permissions_title">Faltan permisos</string>
     <string name="denied_permission_voice_message">Para enviar mensajes de voz has de otorgar el permiso de Micrófono.</string>
     <string name="denied_permission_camera">Para llevar a cabo esta acción has de otorgar el permiso de Cámara en las preferencias del sistema.</string>
@@ -2036,7 +2038,7 @@
     <string name="other_spaces_or_rooms_you_might_not_know">Otros espacios o habitaciones que puede que no conozcas</string>
     <string name="joining_replacement_room">Unirse a la sala de repuesto</string>
     <string name="a11y_unsent_draft">Tiene borradores sin enviar</string>
-    <string name="you_may_contact_me">Puedes contactarme si tienes dudas de seguimiento</string>
+    <string name="you_may_contact_me">Puedes contactarme si tienes alguna duda</string>
     <string name="upgrade_room_no_power_to_manage">Necesitas permiso para actualizar una sala</string>
     <string name="upgrade_room_update_parent_space">Actualizar el espacio padre automáticamente</string>
     <string name="upgrade_room_auto_invite">Invitar usuarios automáticamente</string>
@@ -2077,7 +2079,7 @@
     <string name="create_spaces_details_public_header">Añade algunos detalles para ayudarlo a destacar. Puedes cambiar esto en cualquier momento.</string>
     <string name="create_spaces_private_teammates">Un espacio privado para ti y tus compañeros de equipo</string>
     <string name="create_spaces_organise_rooms">Un espacio privado para organizar tus salas</string>
-    <string name="create_spaces_make_sure_access">Asegúrate de que son las personas correctas las que tienen acceso a %s. Puedes cambiar esto más tarde.</string>
+    <string name="create_spaces_make_sure_access">Asegúrate de que las personas correctas tienen acceso a %s.</string>
     <string name="create_spaces_who_are_you_working_with">¿Con quién estás trabajando\?</string>
     <string name="create_spaces_join_info_help">Para unirte a un espacio existente necesitas una invitación.</string>
     <string name="create_spaces_you_can_change_later">Puedes cambiar esto más tarde</string>
@@ -2178,7 +2180,7 @@
     <string name="command_description_room_avatar">Cambiar el avatar de la sala actual</string>
     <string name="command_description_nick_for_room">Cambiar su apodo para mostrar solo en la sala actual</string>
     <string name="command_description_room_name">Establecer el nombre de la sala</string>
-    <string name="command_description_unignore_user">Deja de ignorar a un usuario, muestra sus mensajes en el futuro.</string>
+    <string name="command_description_unignore_user">Deja de ignorar a un usuario, muestra sus mensajes en el futuro</string>
     <string name="command_description_ignore_user">Ignorar a un usuario, ocultándole sus mensajes</string>
     <string name="space_you_know_that_contains_this_room">Espacio que sabes que contiene esta sala</string>
     <string name="room_settings_space_access_public_description">Cualquiera puede encontrar el espacio y unirse</string>
@@ -2304,4 +2306,181 @@
     <string name="thread_list_modal_title">Filtrar</string>
     <string name="room_notification_more_than_two_users_are_typing">%1$s, %2$s y otros</string>
     <string name="action_thread_copy_link_to_thread">Copiar enlace al hilo</string>
+    <string name="tooltip_attachment_sticker">Enviar sticker</string>
+    <string name="location_timeline_failed_to_load_map">Ocurrió un error al cargar el mapa</string>
+    <string name="ftue_personalize_complete_title">¡Estás listo!</string>
+    <string name="search_thread_from_a_thread">Desde un hilo</string>
+    <string name="thread_list_empty_subtitle">Los hilos ayudan a mantener sus conversaciones en el tema fijado y son fáciles de organizar.</string>
+    <string name="analytics_opt_in_list_item_3">Puedes apagar esto en cualquier momento en configuración</string>
+    <string name="threads_labs_enable_notice_message">Tu servidor doméstico actualmente no soporta hilos, por lo tanto esta función podría ser poco fiable. Algunos mensajes en hilos puede que no estén disponibles de forma fiable. %s ¿Deseas activar la función de hilos de todas formas\?</string>
+    <string name="threads_beta_enable_notice_title">Beta de hilos</string>
+    <string name="threads_notice_migration_message">Nos estamos acercando a el lanzamiento de una beta pública para hilos.
+\n
+\nMientras nos preparamos, tenemos que hacer algunos cambios: los hilos creados a partir de ahora se mostrarán como respuestas normales.
+\n
+\nEsto será una transición debido a que los hilos son ahora parte de la especificación Matrix.</string>
+    <string name="threads_notice_migration_title">Hilos acercándose a versión beta 🎉</string>
+    <string name="login_splash_already_have_account">Ya tengo una cuenta</string>
+    <string name="login_splash_create_account">Crear cuenta</string>
+    <string name="ftue_personalize_skip_this_step">Saltar este paso</string>
+    <string name="ftue_personalize_submit">Guardar y continuar</string>
+    <string name="ftue_personalize_complete_subtitle">Tus preferencias han sido guardadas.</string>
+    <string name="ftue_personalize_lets_go">Vámonos</string>
+    <string name="ftue_profile_picture_title">Añadir una foto de perfil</string>
+    <string name="ftue_display_name_entry_footer">Puedes cambiar esto más tarde</string>
+    <string name="ftue_display_name_entry_title">Nombre público</string>
+    <string name="ftue_display_name_title">Escoger un nombre público</string>
+    <string name="ftue_account_created_subtitle">Tu cuenta %s ha sido creada.</string>
+    <string name="ftue_account_created_congratulations_title">¡Felicidades!</string>
+    <string name="give_feedback_threads">Dar opinión</string>
+    <string name="beta_title_bottom_sheet_action">BETA</string>
+    <string name="settings_presence_user_always_appears_offline">Modo fuera de línea</string>
+    <string name="settings_presence">Presencia</string>
+    <string name="analytics_opt_in_list_item_2">Nosotros <b> no </b> compartimos información con terceros</string>
+    <string name="analytics_opt_in_list_item_1">Nosotros <b> no </b> grabamos o perfilamos ningún dato de cuenta</string>
+    <string name="analytics_opt_in_title">Ayudar a mejorar ${app_name}</string>
+    <string name="location_share_live_select_duration_option_3">8 horas</string>
+    <string name="location_share_live_select_duration_option_2">1 hora</string>
+    <string name="location_share_live_select_duration_option_1">15 minutos</string>
+    <string name="location_in_background_missing_permission_dialog_title">Permitir acceso</string>
+    <string name="labs_render_locations_in_timeline">Mostrar ubicaciónes de usuarios en la línea de tiempo</string>
+    <string name="location_share_live_enabled">Ubicación en vivo activada</string>
+    <string name="location_share_live_started">Cargando ubicación en vivo…</string>
+    <string name="location_share_live_stop">Parar</string>
+    <string name="message_bubbles">Mostrar burbujas de mensajes</string>
+    <string name="tooltip_attachment_photo">Abrir cámara</string>
+    <string name="tooltip_attachment_gallery">Enviar imágenes y vídeos</string>
+    <string name="tooltip_attachment_file">Subir archivo</string>
+    <string name="tooltip_attachment_contact">Abrir contactos</string>
+    <plurals name="message_reaction_show_more">
+        <item quantity="one">%1$d más</item>
+        <item quantity="other">%1$d más</item>
+    </plurals>
+    <string name="message_reaction_show_less">Mostrar menos</string>
+    <string name="tooltip_attachment_location">Compartir ubicación</string>
+    <string name="tooltip_attachment_poll">Crear encuesta</string>
+    <string name="analytics_opt_in_content_link">aquí</string>
+    <string name="action_learn_more">Aprender más</string>
+    <string name="action_try_it_out">Pruébalo</string>
+    <string name="action_disable">Deshabilitar</string>
+    <plurals name="notice_room_server_acl_changes">
+        <item quantity="one">%d cambio de ACL del servidor</item>
+        <item quantity="other">%d cambios de ALC de los servidores</item>
+    </plurals>
+    <string name="a11y_location_share_option_pinned_icon">Compartir esta ubicación</string>
+    <string name="a11y_location_share_option_user_live_icon">Compartir ubicación en tiempo real</string>
+    <string name="a11y_location_share_option_user_current_icon">Compartir mi ubicación actual</string>
+    <string name="location_share" tools:ignore="UnusedResources">Compartir ubicación</string>
+    <string name="ftue_auth_carousel_workplace_body">${app_name} también es estupenda para el trabajo. Es confiada por las organizaciones más seguras del mundo.</string>
+    <string name="identity_server_consent_dialog_content_3">Para descubrir contactos ya existentes, tendrás que enviar información de contacto (emails y números de teléfono) a tu servidor de identidad. Aplicamos hashes en tus datos antes de enviarlos por privacidad.</string>
+    <string name="send_feedback_threads_info">Los hilos son un trabajo en progreso con nuevas y excitantes características nuevas, como notificaciones mejoradas. ¡Nos encantaría escuchar tus comentarios!</string>
+    <string name="settings_presence_user_always_appears_offline_summary">Si se activa, siempre aparecerás como fuera de línea para otros usuarios, incluso cuando uses la aplicación.</string>
+    <string name="threads_beta_enable_notice_message">Los hilos ayudan a mantener tus conversaciones en el asunto y las hacen más fáciles de rastrear. %sHabilitar la función de hilos refrescará la aplicación. Esto podría tardar más en algunas cuentas.</string>
+    <string name="room_message_autocomplete_notification">Notificación de sala</string>
+    <string name="room_message_autocomplete_users">Usuarios</string>
+    <string name="room_message_notify_everyone">Notificar a toda la sala</string>
+    <string name="live_location_sharing_notification_description">La compartición de ubicación está en progreso</string>
+    <string name="live_location_sharing_notification_title">${app_name} Ubicación en directo</string>
+    <string name="settings_enable_location_sharing_summary">Cuando se active serás capaz de enviar tu ubicación a cualquier sala</string>
+    <string name="settings_enable_location_sharing">Activar compartir ubicación</string>
+    <string name="location_share_external">Abrir con</string>
+    <string name="location_not_available_dialog_content">${app_name} no ha podido acceder a tu ubicación. Por favor, inténtalo de nuevo más tarde.</string>
+    <string name="location_not_available_dialog_title">${app_name} no ha podido acceder a tu ubicación</string>
+    <string name="location_in_background_missing_permission_dialog_content">If te gustaría compartir tu ubicación en tiempo real, ${app_name} necesita permiso de ubicación siempre cuando la aplicación esté en segundo plano
+\nSolo acederemos a tu ubicación para la duración que escogas.</string>
+    <string name="location_share_live_select_duration_title">Compartir tu ubicación en directo para</string>
+    <string name="location_share_option_pinned">Compartir esta ubicación</string>
+    <string name="location_share_option_user_live">Compartir ubicación en directo</string>
+    <string name="location_share_option_user_current">Compartir mi ubicación actual</string>
+    <string name="a11y_location_share_locate_button">Hacer zoom a ubicación actual</string>
+    <string name="a11y_location_share_pin_on_map">Pin de ubicación selecionada en el mapa</string>
+    <string name="a11y_static_map_image">Mapa</string>
+    <string name="a11y_location_share_icon" tools:ignore="UnusedResources">Compartir ubicación</string>
+    <string name="location_activity_title_preview">Ubicación</string>
+    <string name="location_activity_title_static_sharing">Compartir ubicación</string>
+    <string name="closed_poll_option_description">Los resultados solo se revelan cuando finalices la encuesta</string>
+    <string name="closed_poll_option_title">Encuesta cerrada</string>
+    <string name="open_poll_option_description">Los votantes verán los resultados tan pronto como hayan votado</string>
+    <string name="open_poll_option_title">Abrir encuesta</string>
+    <string name="poll_type_title">Tipo de encuesta</string>
+    <string name="edit_poll_title">Editar encuesta</string>
+    <string name="delete_poll_dialog_content">¿Estás seguro de que quieres eliminar esta encuesta\? No podrás recuperarla cuando se elimine.</string>
+    <string name="delete_poll_dialog_title">Eliminar encuesta</string>
+    <string name="poll_end_room_list_preview">Encuesta finalizada</string>
+    <string name="poll_response_room_list_preview">Voto enviado</string>
+    <string name="end_poll_confirmation_approve_button">Finalizar encuesta</string>
+    <string name="end_poll_confirmation_description">Esto evitará que las personas puedan votar y mostrará los resultados finales de la encuesta.</string>
+    <string name="end_poll_confirmation_title">¿Finalizar encuesta\?</string>
+    <string name="a11y_poll_winner_option">opción ganadora</string>
+    <string name="poll_end_action">Finalizar encuesta</string>
+    <plurals name="poll_total_vote_count_after_ended">
+        <item quantity="one">Resultado final basado en %1$d voto</item>
+        <item quantity="other">Resultado final basado en %1$d votos</item>
+    </plurals>
+    <plurals name="poll_total_vote_count_before_ended_and_not_voted">
+        <item quantity="one">%1$d voto enviado. Vota para ver los resultados</item>
+        <item quantity="other">%1$d votos enviados. Vota para ver los resultados</item>
+    </plurals>
+    <string name="poll_no_votes_cast">No hay ningún voto</string>
+    <plurals name="poll_total_vote_count_before_ended_and_voted">
+        <item quantity="one">Basado en %1$d voto</item>
+        <item quantity="other">Basado en %1$d votos</item>
+    </plurals>
+    <plurals name="poll_option_vote_count">
+        <item quantity="one">%1$d voto</item>
+        <item quantity="other">%1$d votos</item>
+    </plurals>
+    <plurals name="create_poll_not_enough_options_error">
+        <item quantity="one">Al menos %1$s opción es requerida</item>
+        <item quantity="other">Al menos %1$s opciones son requeridas</item>
+    </plurals>
+    <string name="create_poll_empty_question_error">La pregunta no puede estar vacía</string>
+    <string name="create_poll_button">CREAR ENCUESTA</string>
+    <string name="create_poll_add_option">AÑADIR OPCIÓN</string>
+    <string name="create_poll_options_hint">Opción %1$d</string>
+    <string name="create_poll_options_title">Crear opciones</string>
+    <string name="create_poll_question_hint">Pregunta o asunto</string>
+    <string name="create_poll_question_title">Pregunta o asunto de encuesta</string>
+    <string name="create_poll_title">Crear Encuesta</string>
+    <string name="restart_the_application_to_apply_changes">Reinicia la aplicación para que el cambio surta efecto.</string>
+    <string name="analytics_opt_in_content">Ayúdanos a identificar problemas y a mejorar ${app_name} compartiendo datos de uso anónimos. Para comprender como las personas usan múltiples dispositivos, generaremos un identificador aleatorio, compartido por tus dispositivos.
+\n
+\nPuedes leer todos nuestros términos en %s.</string>
+    <string name="labs_enable_latex_maths">Habilitar matemáticas con LaTeX</string>
+    <string name="audio_message_file_size">(%1$s)</string>
+    <string name="audio_message_reply_content">%1$s (%2$s)</string>
+    <string name="error_audio_message_unable_to_play">Ocurrió un error al reproducir %1$s</string>
+    <string name="a11y_pause_audio_message">Pausar %1$s</string>
+    <string name="a11y_play_audio_message">Reproducir %1$s</string>
+    <string name="a11y_audio_playback_duration">%1$d minutos %2$d segundos</string>
+    <string name="a11y_audio_message_item">%1$s,%2$s,%3$s</string>
+    <string name="labs_enable_thread_messages_desc">Nota: la applicación se reiniciará</string>
+    <string name="labs_enable_thread_messages">Activar mensajes en hilo</string>
+    <string name="labs_auto_report_uisi_desc">Tu sistema automáticamente enviará registros cuando ocurra un fallo al desencriptar</string>
+    <string name="labs_auto_report_uisi">Reportar errores de desencriptado automáticamente.</string>
+    <string name="a11y_presence_unavailable">No disponible</string>
+    <string name="a11y_presence_offline">Fuera de línea</string>
+    <string name="a11y_presence_online">En línea</string>
+    <string name="error_forbidden_digits_only_username">El servidor doméstico no acepta nombres de usuario con únicamente dígitos.</string>
+    <string name="encryption_misconfigured">La encriptación está configurada de manera incorrecta</string>
+    <string name="room_member_override_nick_color">Sobreescribir color del nick</string>
+    <string name="room_profile_section_restore_security">Restaurar Encriptación</string>
+    <string name="contact_admin_to_restore_encryption">Por favor, contacta con un administrador para restablecer la encriptación a un estado válido.</string>
+    <string name="encryption_has_been_misconfigured">La encriptación ha sido configurada de forma incorrecta.</string>
+    <string name="sent_live_location">Compartieron su localización en vivo</string>
+    <string name="sent_location">Compartieron su localización</string>
+    <string name="ftue_profile_picture_subtitle">Puedes cambiar esto en todo momento.</string>
+    <string name="ftue_display_name_subtitle">Esto se mostrará cuando mandes mensajes.</string>
+    <string name="ftue_account_created_take_me_home">Llévame a casa</string>
+    <string name="ftue_account_created_personalize">Personalizar perfil</string>
+    <string name="ftue_auth_use_case_connect_to_server">Conectar a servidor</string>
+    <string name="ftue_auth_use_case_join_existing_server">¿Querías unirte a un servidor ya existente\?</string>
+    <string name="ftue_auth_carousel_encrypted_body">Encriptado extremo-a-extremo, sin requerir un número de teléfono. Sin anuncios o minado de datos.</string>
+    <string name="ftue_auth_carousel_control_body">Elige dónde se almacenan tus conversaciones, dándote control e independencia. Conectado mediante Matrix.</string>
+    <string name="ftue_auth_carousel_secure_body">La comunicación segura e independiente que te da el mismo nivel de privacidad que una conversación cara a cara en tu propio hogar.</string>
+    <string name="identity_server_consent_dialog_title_2">Enviar emials y números de teléfono a %s</string>
+    <string name="settings_discovery_consent_notice_off_2">Tus contactos son privados. Para descubrir usuarios desde tus contactos, necesitamos tu permiso para enviar información de contactos a tu servidor de identidad.</string>
+    <string name="beta">BETA</string>
+    <string name="send_feedback_threads_title">Comentarios de la beta de hilos</string>
+    <string name="threads_labs_enable_notice_title">Beta de hilos</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index e320550323..79eee81fa9 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -245,7 +245,7 @@
     <string name="are_you_sure">Kas sa oled kindel\?</string>
     <string name="backup">Varunda</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Kui sa enne väljalogimist ei varunda oma võtmeid, siis sa kaotad ligipääsu oma krüptitud sõnumitele.</string>
-    <string name="loading">Laeme…</string>
+    <string name="loading">Laadime…</string>
     <string name="ok">Sobib</string>
     <string name="action_cancel">Tühista</string>
     <string name="action_save">Salvesta</string>
@@ -743,7 +743,9 @@
 \nÜldistest seadistustest saad seda alati muuta.</string>
     <string name="room_participants_action_ignore">Eira selle kasutaja sõnumeid</string>
     <string name="room_participants_action_unignore_title">Lõpeta selle kasutaja eiramine</string>
-    <string name="room_participants_action_unignore_prompt_msg">Selle kasutaja eiramise lõpetamine teeb tema sõnumid uuesti nähtavaks.</string>
+    <string name="room_participants_action_unignore_prompt_msg">Selle kasutaja eiramise lõpetamine teeb tema sõnumid uuesti nähtavaks.
+\n
+\nPalun arvesta, et samaga käivitud rakendub uuesti ning andmete sünkroniseerimiseks kulub natuke aega.</string>
     <string name="room_participants_action_unignore">Lõpeta eiramine</string>
     <string name="room_participants_action_cancel_invite_title">Tühista kutse</string>
     <string name="room_participants_action_cancel_invite_prompt_msg">Kas oled kindel et sa soovid tühistada kutse sellele kasutajale\?</string>
@@ -1958,7 +1960,7 @@
     <string name="spaces_beta_welcome_to_spaces_desc">Kogukonnakeskused on uus võimalus siduda jututubasid ja inimesi.</string>
     <string name="space_add_existing_rooms">Lisa olemasolevaid jututubasid ja kogukonnakeskuseid</string>
     <string name="leave_space">Lahku kogukonnast</string>
-    <string name="space_add_child_title">Lisa jututuba</string>
+    <string name="space_add_child_title">Lisa jututube</string>
     <string name="space_explore_activity_title">Tutvu jututubadega</string>
     <plurals name="space_people_you_know">
         <item quantity="one">%d sinu tuttav on juba liitunud</item>
@@ -1968,7 +1970,7 @@
 \nProovi hiljem uuesti või küsi jututoa haldajalt, kas sul on olemas selleks vajalikud õigused.</string>
     <string name="join_anyway">Liitu ikkagi</string>
     <string name="join_space">Liitu kogukonnakeskusega</string>
-    <string name="create_space">Loo kogukonnakeskus</string>
+    <string name="create_space">Loo kogukond</string>
     <string name="skip_for_now">Hetkel jäta vahele</string>
     <string name="share_space_link_message">Palun liitu %1$s kogukonnakeskusega %2$s</string>
     <string name="invite_just_to_this_room_desc">Nad ei saa osalema %s jututoas</string>
@@ -2007,7 +2009,7 @@
     <string name="create_spaces_choose_type_label">Missugust kogukonnakeskust sooviksid sa luua\?</string>
     <string name="your_private_space">Sinu privaatne kogukonnakeskus</string>
     <string name="your_public_space">Sinu avalik kogukonnakeskus</string>
-    <string name="add_space">Lisa kogukonnakeskus</string>
+    <string name="add_space">Lisa kogukond</string>
     <string name="command_description_leave_room">Lahku antud tunnusega jututoast (tunnuse puudumisel jututoast, kus hetkel asud)</string>
     <string name="command_description_join_space">Liitu kogukonnakeskusega tema tunnuse alusel</string>
     <string name="command_description_create_space">Loo kogukonnakeskus</string>
@@ -2438,4 +2440,51 @@
 \n
 \nKuna jutulõngad on nüüd osa Matrix\'i spetsifikatsioonist, siis see on ühekordne muudatus.</string>
     <string name="threads_notice_migration_title">Jutulõngad on peaaegu valmis 🎉</string>
+    <string name="live_location_sharing_notification_description">Asukoha reaalajas jagamine on hetkel kasutusel</string>
+    <string name="live_location_sharing_notification_title">Asukoht reaalajas - ${app_name}</string>
+    <string name="error_forbidden_digits_only_username">Koduserver ei võimalda ainult numbritest koosneva kasutajanime loomist.</string>
+    <string name="ftue_personalize_skip_this_step">Jäta see samm vahele</string>
+    <string name="ftue_personalize_submit">Salvesta ja jätka</string>
+    <string name="ftue_personalize_complete_subtitle">Sinu eelistused on salvestatud.</string>
+    <string name="ftue_personalize_complete_title">Kõik on valmis!</string>
+    <string name="ftue_personalize_lets_go">Alustame nüüd</string>
+    <string name="ftue_profile_picture_subtitle">Sa võid seda hiljem alati muuta.</string>
+    <string name="ftue_profile_picture_title">Lisa profiilipilt</string>
+    <string name="ftue_display_name_entry_footer">Sa võid seda hiljem muuta</string>
+    <string name="ftue_display_name_entry_title">Kuvatav nimi</string>
+    <string name="ftue_display_name_subtitle">Seda näidatakse sõnumite saatmisel.</string>
+    <string name="ftue_display_name_title">Vali kuvatav nimi</string>
+    <string name="ftue_account_created_subtitle">Sinu kasutajakonto %s on nüüd olemas.</string>
+    <string name="ftue_account_created_congratulations_title">Õnnitlused!</string>
+    <string name="ftue_account_created_take_me_home">Mine avalehele</string>
+    <string name="ftue_account_created_personalize">Isikupärasta oma profiili</string>
+    <string name="action_disable">Lülita välja</string>
+    <string name="location_share_live_started">Reaalajas asukoha laadimine…</string>
+    <string name="location_share_live_select_duration_option_3">8 tunni kestel</string>
+    <string name="location_share_live_select_duration_option_2">1 tunni kestel</string>
+    <string name="location_share_live_select_duration_option_1">15 minuti jooksul</string>
+    <string name="location_share_live_select_duration_title">Jaga oma asukohta reaalajas</string>
+    <string name="audio_message_file_size">(%1$s)</string>
+    <string name="audio_message_reply_content">%1$s (%2$s)</string>
+    <string name="error_audio_message_unable_to_play">%1$s helisõnumi esitamine ei õnnestu</string>
+    <string name="a11y_pause_audio_message">Peata helisõnumi esitus: %1$s</string>
+    <string name="a11y_play_audio_message">Esita helisõnumit: %1$s</string>
+    <string name="a11y_audio_playback_duration">%1$d minutit %2$d sekundit</string>
+    <string name="a11y_audio_message_item">%1$s, %2$s, %3$s</string>
+    <string name="sent_live_location">Jagas oma asukohta</string>
+    <string name="ftue_auth_carousel_workplace_body">${app_name} sobib ideaalselt kasutamiseks töökeskkonnas. Ta on kasutusel ka mitmetes üliturvalistes organisatsioonides.</string>
+    <string name="beta">BEETA</string>
+    <string name="send_feedback_threads_title">Jutulõngade beetaversiooni tagasiside</string>
+    <string name="give_feedback_threads">Jaga tagasisidet</string>
+    <string name="beta_title_bottom_sheet_action">BEETA</string>
+    <string name="settings_presence_user_always_appears_offline_summary">Kui see valik on kasutusel, siis sa alati oled teiste jaoks võrgust väljas. Seda ka siis, kui kasutad rakendust.</string>
+    <string name="settings_presence_user_always_appears_offline">Ei ole võrgus</string>
+    <string name="settings_presence">Olek võrgus</string>
+    <string name="threads_labs_enable_notice_message">Sinu koduserver hetkel ei toeta jutulõngasid ning seega antud funktsionaalsus ei pruugi toimida korralikult. Kõik sõnumid jutulõngas ilmselt ei ole loetavad. %sKas sa ikkagi soovid jutulõngad kasutusele võtta\?</string>
+    <string name="threads_labs_enable_notice_title">Jutulõngade beetaversioon</string>
+    <string name="threads_beta_enable_notice_title">Jutulõngade beetaversioon</string>
+    <string name="action_learn_more">Lisateave</string>
+    <string name="action_try_it_out">Proovi nüüd</string>
+    <string name="send_feedback_threads_info">Jutulõngad on hetkel arendusjärgus funktsionaalsus ning samaga lisandub ka senisest parem versioon teavitustest. Me hea meelega tahaksime kuulda, mida sa nendest muutustest arvad!</string>
+    <string name="threads_beta_enable_notice_message">Jutulõngad aitavad hoida sinu vestlusi teemakohastena ning kergesti jälgitavatena.%sJutulõngade kasutusele võtmisel laadime rakenduse uuesti. Kui sul on väga mahukad kontod, siis võib natuke aega kuluda.</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index ab6bac5c1b..4d01fe269b 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -1247,7 +1247,7 @@
     <string name="search_no_results">نتیجه‌ای در پی نداشت</string>
     <string name="search_banned_user_hint">فیلترکردن کاربران مسدود شده</string>
     <plurals name="room_details_selected">
-        <item quantity="one">%d مورد</item>
+        <item quantity="one">۱ مورد</item>
         <item quantity="other">%d مورد</item>
     </plurals>
     <string name="ssl_only_accept">تنها اگر مدیر کارساز، اثرانگشتی منتشر کرده که با بالایی مطابق است، بپذیرید.</string>
@@ -1256,7 +1256,9 @@
     <string name="ssl_cert_new_account_expl">اگر مدیر کارساز خبر از مورد انتظار بودنش داده، مطمئن شوید که اثر انگشت زیر با اثر انگشت ارائه شده به دستشان مطابق است.</string>
     <string name="ssl_cert_not_trust">می‌تواند به این معنی باشد که کسی شدامدتان را بدخواهانه دستکاری کرده یا تلفنتان، به گواهی فراهم‌شده به دست کارساز دوردست، اطمینان ندارد.</string>
     <string name="room_participants_unban_prompt_msg">با لغو مسدودیت، کاربر می‌تواند مجددا به اتاق اضافه شود.</string>
-    <string name="room_participants_action_unignore_prompt_msg">لغو نادیده‌گیری کاربر سبب می‌شود دوباره همه پیام‌های او نمایش داده شود.</string>
+    <string name="room_participants_action_unignore_prompt_msg">ناچشم‌پوشی این کاربر موجب نمایانی تمامی پیام‌ها از سویش خواهد شد.
+\n
+\nبه خاطر داشته باشید که این کنش کاره را دوباره آغاز خواهد کرد و ممکن است مدّتی زمان ببرد.</string>
     <string name="room_participants_action_ignore_prompt_msg">نادیده‌گرفتن این کاربر پیام‌هایش را از اتاق‌های مشترکتان حذف خواهد کرد.
 \n 
 \nهرگاه که بخواهید می‌توانید این کنش را در تنظیمات کلی لغو کنید.</string>
@@ -2430,4 +2432,59 @@
     <string name="location_share_option_user_current">هم‌رسانی مکان کنونیم</string>
     <string name="a11y_location_share_locate_button">بزرگ‌نمایی به مکان کنونی</string>
     <string name="a11y_location_share_pin_on_map">سنجاق مکان گزیده روی نقشه</string>
+    <string name="threads_notice_migration_message">داریم به ارائه یک بتای عمومی برای رشته‌ها نزدیک‌تر می‌شویم.
+\n
+\nهمین‌طور که برایش آماده می‌شویم، نیاز به انجام چند تغییر است: رشته‌هایی که پیش از این ایجاد شده‌اند،به شکل پاسخ‌های عادی نشان داده خواهند شد.
+\n
+\nاین کار، یک تبدیل یک باره است؛ چرا که رشته‌ها اکنون بخشی از مشخّصات ماتریکسند.</string>
+    <string name="threads_notice_migration_title">رشته‌ها به بتا می رسند 🎉</string>
+    <string name="live_location_sharing_notification_description">هم‌رساین مکان در حال انجام است</string>
+    <string name="live_location_sharing_notification_title">مکان زندهٔ ${app_name}</string>
+    <string name="location_in_background_missing_permission_dialog_content">اگر می‌خواهید مکانتان را هم‌رسانی کنید، ${app_name} نیاز به دسترسی همیشگی مکان هنگام در پس‌زمینه بودن کاره دارد.
+\nفقط برای مدتی که برمی‌گزینید، به مکانتان دسترسی خواهیم داشت.</string>
+    <string name="error_forbidden_digits_only_username">کارساز خانگی، نام‌های کاربری فقط رقمی را نمی‌پذیرد.</string>
+    <string name="ftue_personalize_skip_this_step">پرش از این گام</string>
+    <string name="ftue_personalize_submit">ذخیره و ادامه</string>
+    <string name="ftue_personalize_complete_subtitle">ترجیحاتتان ذخیره شد.</string>
+    <string name="ftue_personalize_complete_title">همه‌چیز تنظیم شده!</string>
+    <string name="ftue_personalize_lets_go">بزن بریم</string>
+    <string name="ftue_profile_picture_subtitle">می‌توانید هرزمانی تغییرش دهید.</string>
+    <string name="ftue_display_name_title">گزینش نامی نمایشی</string>
+    <string name="ftue_profile_picture_title">افزودن یک تصویر نمایه</string>
+    <string name="ftue_display_name_entry_footer">می‌توانید بعدها تغییرش دهید</string>
+    <string name="ftue_display_name_entry_title">نام نمایشی</string>
+    <string name="ftue_display_name_subtitle">هنگامی که پیام می‌فرستید نشان داده خواهد شد.</string>
+    <string name="ftue_account_created_subtitle">حسابتان %s ایجاد شد.</string>
+    <string name="ftue_account_created_congratulations_title">تبریک!</string>
+    <string name="ftue_account_created_take_me_home">مرا به خانه ببر</string>
+    <string name="ftue_account_created_personalize">شخصی سازی نمایه</string>
+    <string name="action_disable">از کار انداختن</string>
+    <string name="send_feedback_threads_info">رشته‌ها کاری در حال پیشرفت با ویژگی‌های جذّاب جدید مانند آگاهی‌های بهبودیافته هستند. دوست داریم بازخوردتان را بشنویم!</string>
+    <string name="threads_labs_enable_notice_message">کارساز خانگیتان در حال حاضر از رشته‌ها پشتیبانی نمی‌کند؛ بنابراین ممکن است این ویژگی قابل اتّکا نباشد. ممکن است برخی پیام‌های رشته‌ای همواره موجود نباشند. %sدر هر صورت می‌خواهید رشته‌ها را به کار بیندازید؟</string>
+    <string name="threads_beta_enable_notice_message">رشته‌ها به روی موضوع نگه داشتن گفت‌وگوها کمک کرده و ردیابیشان را آسان می‌کنند. %sبه کارانداختن رشته‌ها کاره را دوباره آغاز خواهد کرد. ممکن است این کار برای برخی حساب‌ها بیش‌تر طول بکشد.</string>
+    <string name="location_share_live_started">بار کردن مکان زنده…</string>
+    <string name="location_share_live_select_duration_option_3">۸ ساعت</string>
+    <string name="location_share_live_select_duration_option_2">۱ ساعت</string>
+    <string name="location_share_live_select_duration_option_1">۱۵ دقیقه</string>
+    <string name="location_share_live_select_duration_title">هم‌رسانی مکان زنده‌تان برای</string>
+    <string name="audio_message_file_size">(%1$s)</string>
+    <string name="audio_message_reply_content">%1$s (%2$s)</string>
+    <string name="error_audio_message_unable_to_play">ناتوان در پخش %1$s</string>
+    <string name="a11y_pause_audio_message">مکث %1$s</string>
+    <string name="a11y_play_audio_message">پخش %1$s</string>
+    <string name="a11y_audio_playback_duration">%1$d دقیقه و %2$d ثانیه</string>
+    <string name="a11y_audio_message_item">%1$s، %2$s، %3$s</string>
+    <string name="sent_live_location">مکان زنده‌اش را هم‌رساند</string>
+    <string name="ftue_auth_carousel_workplace_body">${app_name} برای محل کار نیز عالیست. مورد اعتماد امن‌ترین سازمان‌های جهان است.</string>
+    <string name="beta">آزمایشی</string>
+    <string name="send_feedback_threads_title">بازخورد رشته‌های آزمایشی</string>
+    <string name="give_feedback_threads">بازخورد دادن</string>
+    <string name="beta_title_bottom_sheet_action">آزمایشی</string>
+    <string name="settings_presence_user_always_appears_offline_summary">اگر به کار افتاده باشد، برای دیگر کاربران، همواره برون‌خط ظاهر خواهید شد، حتا هنگام استفاده از برنامه.</string>
+    <string name="settings_presence_user_always_appears_offline">حالت برون‌خط</string>
+    <string name="settings_presence">حضور</string>
+    <string name="threads_labs_enable_notice_title">رشته‌های آزمایشی</string>
+    <string name="threads_beta_enable_notice_title">رشته‌های آزمایشی</string>
+    <string name="action_learn_more">بیش تر بدانید</string>
+    <string name="action_try_it_out">بیازماییدش</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index c5e67771dd..9d084fa8ba 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -42,7 +42,7 @@
     <string name="initial_sync_start_importing_account">Alkusynkronointi:
 \nTuodaan tiliä…</string>
     <string name="initial_sync_start_importing_account_crypto">Alkusynkronointi:
-\nTuodaan kryptoa</string>
+\nTuodaan krypto</string>
     <string name="initial_sync_start_importing_account_rooms">Alkusynkronointi:
 \nTuodaan huoneita</string>
     <string name="initial_sync_start_importing_account_joined_rooms">Alkusynkronointi:
@@ -267,7 +267,7 @@
     <string name="action_remove">Poista</string>
     <string name="action_join">Liity</string>
     <string name="action_reject">Hylkää</string>
-    <string name="room_jump_to_first_unread">Siirry ensimmäiseen lukemattomaan viestiin.</string>
+    <string name="room_jump_to_first_unread">Siirry lukemattomaan</string>
     <string name="room_participants_leave_prompt_title">Poistu huoneesta</string>
     <string name="room_participants_leave_prompt_msg">Haluatko varmasti poistua huoneesta?</string>
     <string name="room_participants_header_direct_chats">YKSITYISKESKUSTELUT</string>
@@ -516,7 +516,7 @@
     <string name="settings_call_ringtone_use_app_ringtone">Käytä ${app_name}in oletussoittoääntä saapuville puheluille</string>
     <string name="settings_call_ringtone_title">Saapuvien puheluiden soittoääni</string>
     <string name="video_call_in_progress">Videopuhelu menossa…</string>
-    <string name="list_members">Käyttäjälista</string>
+    <string name="list_members">Jäsenet</string>
     <plurals name="room_title_members">
         <item quantity="one">yksi jäsen</item>
         <item quantity="other">%d jäsentä</item>
@@ -1562,7 +1562,7 @@
     <string name="space_leave_prompt_msg_private">Et voi liittyä uudelleen, ellei sinua kutsuta uudelleen.</string>
     <string name="space_leave_prompt_msg_only_you">Olet ainoa henkilö täällä. Jos poistut, kukaan ei voi liittyä tänne tulevaisuudessa, et edes sinä.</string>
     <string name="space_leave_prompt_msg_with_name">Haluatko varmasti poistua avaruudesta %s\?</string>
-    <string name="leave_space">Poistu avaruudesta</string>
+    <string name="leave_space">Poistu</string>
     <string name="space_add_child_title">Lisää huoneita</string>
     <string name="space_explore_activity_title">Selaa huoneita</string>
     <plurals name="space_people_you_know">
@@ -2053,4 +2053,54 @@
         <item quantity="other">%1$s lisäsi tälle huoneelle vaihtoehtoiset osoitteet %2$s.</item>
     </plurals>
     <string name="room_error_access_unauthorized">Sinulla ei ole lupaa liittyä tähän huoneeseen</string>
+    <string name="room_message_autocomplete_users">Käyttäjät</string>
+    <plurals name="message_reaction_show_more">
+        <item quantity="one">%1$d lisää</item>
+        <item quantity="other">%1$d lisää</item>
+    </plurals>
+    <string name="tooltip_attachment_file">Lähetä tiedosto</string>
+    <string name="location_share_live_stop">Pysäytä</string>
+    <string name="a11y_location_share_option_pinned_icon">Jaa tämä sijainti</string>
+    <string name="location_share_option_pinned">Jaa tämä sijainti</string>
+    <string name="a11y_location_share_option_user_current_icon">Jaa nykyinen sijaintini</string>
+    <string name="location_share_option_user_current">Jaa nykyinen sijaintini</string>
+    <string name="restart_the_application_to_apply_changes">Käynnistä sovellus uudelleen, jotta muutos tulee voimaan.</string>
+    <string name="space_add_existing_rooms">Lisää olemassa olevia huoneita ja avaruuksia</string>
+    <string name="dont_leave_any">Älä poistu mistään huoneesta ja avaruudesta</string>
+    <string name="leave_all_rooms_and_spaces">Poistu kaikista huoneista ja avaruuksista</string>
+    <string name="use_latest_app">Käytä ${app_name}in uusinta versiota muilla laitteillasi:</string>
+    <string name="ftue_personalize_skip_this_step">Ohita tämä vaihe</string>
+    <string name="ftue_personalize_submit">Tallenna ja jatka</string>
+    <string name="ftue_personalize_complete_subtitle">Asetukset on tallennettu.</string>
+    <string name="ftue_personalize_complete_title">Kaikki valmista!</string>
+    <string name="ftue_personalize_lets_go">Menoksi</string>
+    <string name="ftue_profile_picture_subtitle">Voit vaihtaa tämän milloin tahansa.</string>
+    <string name="ftue_profile_picture_title">Lisää profiilikuva</string>
+    <string name="ftue_display_name_entry_footer">Voit vaihtaa tämän myöhemmin</string>
+    <string name="ftue_display_name_entry_title">Näyttönimi</string>
+    <string name="ftue_display_name_subtitle">Tämä näytetään, kun lähetät viestejä.</string>
+    <string name="ftue_display_name_title">Valitse näyttönimi</string>
+    <string name="ftue_account_created_subtitle">Tilisi %s on luotu.</string>
+    <string name="ftue_account_created_congratulations_title">Onnittelut!</string>
+    <string name="ftue_account_created_personalize">Personoi profiili</string>
+    <string name="ftue_auth_use_case_skip_partial">ohittaa tämän kysymyksen</string>
+    <string name="ftue_auth_use_case_skip">Ei varmuutta vielä\? Voit %s</string>
+    <string name="settings_discovery_no_policy_provided">Identiteettipalvelin ei tarjoa käytäntöä</string>
+    <string name="settings_discovery_hide_identity_server_policy_title">Piilota identiteettipalvelimen käytäntö</string>
+    <string name="settings_discovery_show_identity_server_policy_title">Näytä identiteettipalvelimen käytäntö</string>
+    <string name="error_jitsi_join_conf">Valitettavasti konfrenssiin liityttäessä ilmeni virhe</string>
+    <string name="legals_no_policy_provided">Tämä palvelin ei tarjoa mitään käytäntöä.</string>
+    <string name="legals_identity_server_title">Identiteettipalvelimesi käytäntö</string>
+    <string name="legals_home_server_title">Kotipalvelimesi käytäntö</string>
+    <string name="legals_application_title">${app_name}-käytäntö</string>
+    <string name="action_thread_copy_link_to_thread">Kopioi linkki ketjuun</string>
+    <string name="action_disable">Poista käytöstä</string>
+    <string name="preference_system_settings">Järjestelmän asetukset</string>
+    <string name="preference_help_summary">Apua ${app_name}in käyttöön</string>
+    <string name="preference_root_legals">Lainopilliset asiat</string>
+    <string name="analytics_opt_in_content_link">tästä</string>
+    <string name="analytics_opt_in_content">Auta meitä tunnistamaan mahdollisia ongelmia ja parantamaan ${app_name}iä jakamalla anonyymia käyttödataa. Ymmärtääksemme miten ihmiset käyttävät useita laitteita, luomme satunnaisen tunnisteen, joka jaetaan kaikkien laitteidesi kesken.
+\n
+\nLue käyttöehdot %s.</string>
+    <string name="analytics_opt_in_title">Auta parantamaan ${app_name}iä</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index c9230ec49e..ce69d574ba 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -501,7 +501,7 @@
         <item quantity="one">%d nouveau message</item>
         <item quantity="other">%d nouveaux messages</item>
     </plurals>
-    <string name="list_members">Liste les membres</string>
+    <string name="list_members">Membres</string>
     <plurals name="notification_unread_notified_messages">
         <item quantity="one">%d message notifié non lu</item>
         <item quantity="other">%d messages notifiés non lus</item>
@@ -1978,7 +1978,7 @@
     <string name="you_are_invited">Vous êtes invité</string>
     <string name="spaces_beta_welcome_to_spaces_desc">Les espaces sont une nouvelle manière de regrouper les salons et les gens.</string>
     <string name="space_add_existing_rooms">Ajouter des salons et espaces existants</string>
-    <string name="leave_space">Quitter l’espace</string>
+    <string name="leave_space">Quitter</string>
     <string name="space_add_child_title">Ajouter des salons</string>
     <string name="space_explore_activity_title">Parcourir les salons</string>
     <plurals name="space_people_you_know">
@@ -2419,4 +2419,42 @@
         <item quantity="one">%d changement des ACL du serveur</item>
         <item quantity="other">%d changements des ACL du serveur</item>
     </plurals>
+    <string name="live_location_sharing_notification_description">Partage de la position en cours</string>
+    <string name="live_location_sharing_notification_title">Position en temps réel de ${app_name}</string>
+    <string name="location_share_live_stop">Arrêter</string>
+    <string name="location_share_live_enabled">Position en temps réel activée</string>
+    <string name="location_in_background_missing_permission_dialog_content">Si vous souhaitez partager votre position en temps réel, ${app_name} a besoin de l’autorisation d’accès permanent à la position quand l’application est en arrière-plan.
+\nNous accèderons à votre position seulement pendant la durée que vous définissez.</string>
+    <string name="location_in_background_missing_permission_dialog_title">Autoriser l’accès</string>
+    <string name="a11y_location_share_option_pinned_icon">Partager cet emplacement</string>
+    <string name="location_share_option_pinned">Partager cet emplacement</string>
+    <string name="a11y_location_share_option_user_live_icon">Partager la position en temps réel</string>
+    <string name="location_share_option_user_live">Partager la position en temps réel</string>
+    <string name="a11y_location_share_option_user_current_icon">Partager ma position actuelle</string>
+    <string name="location_share_option_user_current">Partager ma position actuelle</string>
+    <string name="a11y_location_share_locate_button">Agrandir jusqu’à l’emplacement actuel</string>
+    <string name="a11y_location_share_pin_on_map">Épingle de l’emplacement sélectionné sur la carte</string>
+    <string name="error_forbidden_digits_only_username">Le serveur hôte n’accepte pas de nom d’utilisateur avec seulement des chiffres.</string>
+    <string name="ftue_personalize_skip_this_step">Ignorer cette étape</string>
+    <string name="ftue_personalize_submit">Enregistrer et continuer</string>
+    <string name="ftue_personalize_complete_subtitle">Vos préférences ont été enregistrées.</string>
+    <string name="ftue_personalize_complete_title">Tout est prêt !</string>
+    <string name="ftue_personalize_lets_go">Allons-y</string>
+    <string name="ftue_profile_picture_subtitle">Vous pouvez la changer à tout moment.</string>
+    <string name="ftue_profile_picture_title">Ajouter une photo de profil</string>
+    <string name="ftue_display_name_entry_footer">Vous pourrez le changer plus tard</string>
+    <string name="ftue_display_name_entry_title">Nom d’affichage</string>
+    <string name="ftue_display_name_subtitle">Il sera affiché quand vous enverrez des messages.</string>
+    <string name="ftue_display_name_title">Choisissez un nom d’affichage</string>
+    <string name="ftue_account_created_subtitle">Votre compte %s a été créé.</string>
+    <string name="ftue_account_created_congratulations_title">Félicitations !</string>
+    <string name="ftue_account_created_take_me_home">Aller à l’accueil</string>
+    <string name="ftue_account_created_personalize">Personnaliser le profil</string>
+    <string name="threads_notice_migration_title">Les fils de discussion se rapproche de la bêta 🎉</string>
+    <string name="action_disable">Désactiver</string>
+    <string name="threads_notice_migration_message">Nous nous approchons d’une publication en bêta des fils de discussions.
+\n
+\nPour nous y préparer, nous avons besoin de faire certains changements : les fils créés avant maintenant seront affichés comme des réponses classiques.
+\n
+\nCette transition sera unique, maintenant que les fils de discussions ont intégré la spécification de Matrix.</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index f13a97d216..3a8184cef7 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -1486,7 +1486,9 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
 \n
 \nEzt a műveletet bármikor visszavonhatja az általános beállításokban.</string>
     <string name="room_participants_action_unignore_title">Felhasználó figyelembe vétele</string>
-    <string name="room_participants_action_unignore_prompt_msg">A felhasználó figyelembe vétele után újra meg fog jelenni az összes üzenete.</string>
+    <string name="room_participants_action_unignore_prompt_msg">A felhasználó figyelembe vétele után újra meg fog jelenni az összes üzenete.
+\n
+\nEz a művelet újraindítja az alkalmazást ami sokáig tarthat.</string>
     <string name="room_participants_action_cancel_invite_title">Meghívás visszavonása</string>
     <string name="room_participants_action_cancel_invite_prompt_msg">Biztos, hogy visszavonja a felhasználó meghívását\?</string>
     <string name="room_participants_remove_prompt_msg">a felhasználó kirúgása eltávolítja a szobából.
@@ -2438,4 +2440,51 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="a11y_location_share_locate_button">Ugrás a jelenlegi pozícióra</string>
     <string name="a11y_location_share_pin_on_map">Kiválasztott hely rögzítése a térképen</string>
     <string name="threads_notice_migration_title">Üzenetszálak lassan béta állapotba kerülnek 🎉</string>
+    <string name="live_location_sharing_notification_description">Helymeghatározás folyamatban</string>
+    <string name="live_location_sharing_notification_title">${app_name} Folyamatos helymeghatározás</string>
+    <string name="error_forbidden_digits_only_username">A matrix szerver nem fogad el olyan felhasználói nevet ami csak számokból áll.</string>
+    <string name="ftue_personalize_skip_this_step">Lépés kihagyása</string>
+    <string name="ftue_personalize_submit">Mentés és tovább</string>
+    <string name="ftue_personalize_complete_subtitle">A beállítások elmentve.</string>
+    <string name="ftue_personalize_complete_title">Minden kész!</string>
+    <string name="ftue_personalize_lets_go">Gyerünk</string>
+    <string name="ftue_profile_picture_subtitle">Bármikor megváltoztatható.</string>
+    <string name="ftue_profile_picture_title">Profilkép hozzáadása</string>
+    <string name="ftue_display_name_entry_footer">Ezt később meg lehet változtatni</string>
+    <string name="ftue_display_name_entry_title">Megjelenítendő név</string>
+    <string name="ftue_display_name_subtitle">Ez fog megjelenni amikor üzenetet küldesz.</string>
+    <string name="ftue_display_name_title">Válassz egy megjelenítési nevet</string>
+    <string name="ftue_account_created_subtitle">A fiókod elkészült: %s.</string>
+    <string name="ftue_account_created_congratulations_title">Gratulálunk!</string>
+    <string name="ftue_account_created_take_me_home">Vigyél haza</string>
+    <string name="ftue_account_created_personalize">Profil személyre szabása</string>
+    <string name="action_disable">Tiltás</string>
+    <string name="location_share_live_started">Élő földrajzi helyzet meghatározás betöltése…</string>
+    <string name="location_share_live_select_duration_option_3">8 óra</string>
+    <string name="location_share_live_select_duration_option_2">1 óra</string>
+    <string name="location_share_live_select_duration_option_1">15 perc</string>
+    <string name="location_share_live_select_duration_title">Folyamatos helyzet megosztása ezért:</string>
+    <string name="audio_message_file_size">(%1$s)</string>
+    <string name="audio_message_reply_content">%1$s (%2$s)</string>
+    <string name="error_audio_message_unable_to_play">Nem lehet lejátszani ezt: %1$s</string>
+    <string name="a11y_pause_audio_message">Megállít: %1$s</string>
+    <string name="a11y_play_audio_message">Lejátszás: %1$s</string>
+    <string name="a11y_audio_playback_duration">%1$d perc %2$d másodperc</string>
+    <string name="a11y_audio_message_item">%1$s, %2$s, %3$s</string>
+    <string name="sent_live_location">A földrajzi helyzetüket folyamatosan megosztják</string>
+    <string name="ftue_auth_carousel_workplace_body">${app_name} megállja a helyét a munkahelyen is. A világ legbiztonságosabb szervezetei bíznak meg benne.</string>
+    <string name="beta">Béta</string>
+    <string name="send_feedback_threads_info">Üzenetszálak fejlesztése folyamatban van, új és izgalmas funkciókkal, mint a fejlesztett értesítések. Szeretnénk hallani a véleményed!</string>
+    <string name="send_feedback_threads_title">Béta Üzenetszálak visszajelzés</string>
+    <string name="give_feedback_threads">Visszajelzés adása</string>
+    <string name="beta_title_bottom_sheet_action">Béta</string>
+    <string name="settings_presence_user_always_appears_offline_summary">Ha engedélyezed úgy látszol majd mások számára, mintha nem kapcsolódnál a hálózathoz még akkor is amikor az alkalmazást használod.</string>
+    <string name="settings_presence_user_always_appears_offline">Hálózati kapcsolat nélkül</string>
+    <string name="settings_presence">Állapot</string>
+    <string name="threads_labs_enable_notice_message">A Matrix szervered jelenleg nem támogatja az üzenetszálakat így ez a funkció nem lesz megbízható. Bizonyos üzenetszálas üzenetek nem jelennek meg megbízhatóan. %sBiztos, hogy így is engedélyezed az üzenetszálakat\?</string>
+    <string name="threads_labs_enable_notice_title">Béta Üzenetszálak</string>
+    <string name="threads_beta_enable_notice_message">Az üzenetszálak segítenek a különböző témájú beszélgetések figyelemmel kísérésében. %sÜzenetszálak engedélyezése újraindítja az alkalmazást. Ez néhány fióknál sokáig tarthat.</string>
+    <string name="threads_beta_enable_notice_title">Béta Üzenetszálak</string>
+    <string name="action_learn_more">Tudj meg többet</string>
+    <string name="action_try_it_out">Próbáld ki</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-in/strings.xml b/vector/src/main/res/values-in/strings.xml
index 29831c1377..f0533eba10 100644
--- a/vector/src/main/res/values-in/strings.xml
+++ b/vector/src/main/res/values-in/strings.xml
@@ -72,7 +72,7 @@
     <string name="action_join">Gabung</string>
     <string name="action_reject">Tolak</string>
     <string name="later">Nanti</string>
-    <string name="send_bug_report_include_crash_logs">Kirim catat gangguan</string>
+    <string name="send_bug_report_include_crash_logs">Kirim catatan gangguan</string>
     <string name="huge">Raksasa</string>
     <string name="small">Kecil</string>
     <string name="normal">Normal</string>
@@ -87,7 +87,7 @@
     <string name="copied_to_clipboard">Gandakan ke clipboard</string>
     <string name="send_bug_report_include_screenshot">Kirim tampilan layar</string>
     <string name="send_bug_report_description">Mohon uraikan kutu tersebut. Apa yang Anda lakukan\? Apa yang Anda harapkan terjadi\? Apa yang sebenarnya terjadi\?</string>
-    <string name="send_bug_report_logs_description">Catat dari klien akan dikirim bersama laporan gangguan ini untuk mendalami kendala yang Anda temukan. Laporan gangguan ini, termasuk catat dan tangkapan layar, tidak akan terlihat secara umum. Jika Anda hanya ingin mengirimkan tulisan di atas, silakan hapus centang:</string>
+    <string name="send_bug_report_logs_description">Catatan dari klien akan dikirim bersama laporan gangguan ini untuk mendalami kendala yang Anda temukan. Laporan gangguan ini, termasuk catatan dan tangkapan layar, tidak akan terlihat secara umum. Jika Anda hanya ingin mengirimkan tulisan di atas, silakan hapus centang:</string>
     <string name="send_bug_report_alert_message">Sepertinya Anda mengguncang ponsel akibat frustrasi. Apakah Anda ingin membuka halaman laporan kutu\?</string>
     <string name="send_bug_report_failed">Pengiriman laporan kutu gagal (%s)</string>
     <string name="send_bug_report_progress">Kemajuan (%s%%)</string>
@@ -590,7 +590,9 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="room_participants_remove_title">Keluarkan pengguna</string>
     <string name="room_participants_action_cancel_invite_prompt_msg">Apakah Anda yakin ingin membatalkan undangan untuk pengguna ini\?</string>
     <string name="room_participants_action_cancel_invite_title">Batalkan undangan</string>
-    <string name="room_participants_action_unignore_prompt_msg">Membatalkan abaian pengguna ini akan menampilkan semua pesan dari mereka.</string>
+    <string name="room_participants_action_unignore_prompt_msg">Membatalkan abaian pengguna ini akan menampilkan semua pesan dari mereka.
+\n
+\nDicatat bahwa tindakan ini akan memulai ulang aplikasi dan mungkin membutuhkan beberapa waktu.</string>
     <string name="room_participants_action_unignore_title">Batal pengabaian pengguna</string>
     <string name="room_participants_action_ignore_prompt_msg">Mengabaikan pengguna ini akan menghilangkan pesan mereka dari ruangan yang Anda bagikan.
 \n
@@ -1179,8 +1181,8 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="send_attachment">Kirim lampiran</string>
     <string name="error_network_timeout">Sepertinya server terlalu lama merespons, hal ini dapat disebabkan oleh konektivitas yang buruk atau kesalahan pada server. Silakan coba lagi dalam beberapa saat.</string>
     <string name="error_terms_not_accepted">Silakan coba lagi setelah Anda menerima syarat dan ketentuan homeserver Anda.</string>
-    <string name="labs_allow_extended_logging_summary">Log verbose akan membantu pengembang dengan menyediakan lebih banyak catat saat Anda mengirim RageShake. Bahkan ketika diaktifkan, aplikasi tidak mencatat isi pesan atau data pribadi lainnya.</string>
-    <string name="labs_allow_extended_logging">Aktifkan catat verbose.</string>
+    <string name="labs_allow_extended_logging_summary">Catatan verbose akan membantu pengembang dengan menyediakan lebih banyak catat saat Anda mengirim RageShake. Bahkan ketika diaktifkan, aplikasi tidak mencatat isi pesan atau data pribadi lainnya.</string>
+    <string name="labs_allow_extended_logging">Aktifkan catatan verbose.</string>
     <string name="settings_text_message_sent_wrong_code">Kode verifikasi salah.</string>
     <string name="settings_text_message_sent_hint">Kode</string>
     <string name="settings_text_message_sent">Sebuah pesan teks telah dikirim ke %s. Silakan masukkan kode verifikasi yang ada di dalamnya.</string>
@@ -1742,7 +1744,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
 \nCoba lagi nanti, atau tanyakan ke admin ruangan untuk mengecek jika Anda punya akses.</string>
     <string name="join_anyway">Bergabung Saja</string>
     <string name="join_space">Bergabung ke Space</string>
-    <string name="create_space">Buat Space</string>
+    <string name="create_space">Buat space</string>
     <string name="skip_for_now">Lewat untuk sekarang</string>
     <string name="share_space_link_message">Bergabung ke space saya %1$s %2$s</string>
     <string name="invite_just_to_this_room_desc">Mereka tidak akan menjadi bagian dari %s</string>
@@ -1784,7 +1786,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="create_spaces_choose_type_label">Tipe space apa yang Anda ingin buat\?</string>
     <string name="your_private_space">Space privat Anda</string>
     <string name="your_public_space">Space publik Anda</string>
-    <string name="add_space">Tambahkan Space</string>
+    <string name="add_space">Tambahkan space</string>
     <string name="private_space">Space privat</string>
     <string name="public_space">Space publik</string>
     <string name="event_status_delete_all_failed_dialog_message">Apakah Anda yakin untuk menghapus semua pesan yang belum dikirim di ruangan ini\?</string>
@@ -2285,7 +2287,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="restart_the_application_to_apply_changes">Mulai ulang aplikasi ini untuk menerapkan perubahan.</string>
     <string name="labs_enable_latex_maths">Aktifkan matematika LaTeX</string>
     <string name="room_error_access_unauthorized">Anda tidak diperbolehkan untuk bergabung ke ruangan ini</string>
-    <string name="labs_auto_report_uisi_desc">Sistem Anda akan mengirimkan catat secara otomatis ketika sebuah kesalahan dekripsi terjadi</string>
+    <string name="labs_auto_report_uisi_desc">Sistem Anda akan mengirimkan catatan secara otomatis ketika sebuah kesalahan dekripsi terjadi</string>
     <string name="tooltip_attachment_poll">Buat poll</string>
     <string name="tooltip_attachment_contact">Buka kontak</string>
     <string name="tooltip_attachment_sticker">Kirim stiker</string>
@@ -2345,7 +2347,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="ftue_auth_use_case_title">Siapa saja yang sering Anda chat\?</string>
     <string name="navigate_to_thread_when_already_in_the_thread">Anda sudah menampilkan utasan ini!</string>
     <string name="view_in_room">Tampilkan Di Ruangan</string>
-    <string name="reply_in_thread">Balas Di Utasan</string>
+    <string name="reply_in_thread">Balas di utasan</string>
     <string name="command_not_supported_in_threads">Perintah \"%s\" dikenal tetapi tidak didukung dalam utasan.</string>
     <string name="search_thread_from_a_thread">Dari sebuah Utasan</string>
     <string name="thread_list_empty_notice">Tip: Tekan lama pada sebuah pesan dan gunakan “%s”.</string>
@@ -2393,4 +2395,51 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
 \n
 \nIni hanya transisi sekali, utasan sekarang sebagai bagian dari spesifikasi Matrix.</string>
     <string name="threads_notice_migration_title">Utasan Mencapai Beta 🎉</string>
+    <string name="live_location_sharing_notification_description">Penbagian lokasi sedang dilakukan</string>
+    <string name="live_location_sharing_notification_title">${app_name} Lokasi langsung</string>
+    <string name="error_forbidden_digits_only_username">Homeserver tidak menerima nama pengguna dengan hanya angka.</string>
+    <string name="ftue_personalize_skip_this_step">Lewati</string>
+    <string name="ftue_personalize_submit">Simpan dan lanjutkan</string>
+    <string name="ftue_personalize_complete_subtitle">Preferensi Anda telah disimpan.</string>
+    <string name="ftue_personalize_complete_title">Anda siap!</string>
+    <string name="ftue_personalize_lets_go">Ayo</string>
+    <string name="ftue_profile_picture_subtitle">Anda dapat mengubahnya kapan saja.</string>
+    <string name="ftue_profile_picture_title">Tambahkan sebuah foto profil</string>
+    <string name="ftue_display_name_entry_footer">Anda dapat mengubahnya nanti</string>
+    <string name="ftue_display_name_entry_title">Nama Tampilan</string>
+    <string name="ftue_display_name_subtitle">Ini akan ditampilkan ketika Anda mengirim pesan.</string>
+    <string name="ftue_display_name_title">Pilih nama tampilan</string>
+    <string name="ftue_account_created_subtitle">Akun %s Anda telah dibuat.</string>
+    <string name="ftue_account_created_congratulations_title">Selamat!</string>
+    <string name="ftue_account_created_take_me_home">Kembalikan saya ke beranda</string>
+    <string name="ftue_account_created_personalize">Ubah profil</string>
+    <string name="action_disable">Nonaktifkan</string>
+    <string name="location_share_live_started">Memuat lokasi langsung…</string>
+    <string name="location_share_live_select_duration_option_3">8 jam</string>
+    <string name="location_share_live_select_duration_option_2">1 jam</string>
+    <string name="location_share_live_select_duration_option_1">15 menit</string>
+    <string name="location_share_live_select_duration_title">Bagikan lokasi langsung Anda untuk</string>
+    <string name="audio_message_file_size">(%1$s)</string>
+    <string name="audio_message_reply_content">%1$s (%2$s)</string>
+    <string name="error_audio_message_unable_to_play">Tidak dapat memainkan %1$s</string>
+    <string name="a11y_pause_audio_message">Jeda %1$s</string>
+    <string name="a11y_play_audio_message">Mainkan %1$s</string>
+    <string name="a11y_audio_playback_duration">%1$d menit %2$d detik</string>
+    <string name="a11y_audio_message_item">%1$s, %2$s, %3$s</string>
+    <string name="sent_live_location">Membagikan lokasi langsungnya</string>
+    <string name="ftue_auth_carousel_workplace_body">${app_name} juga baik untuk tempat kerja. Dipercayai oleh organisasi yang paling aman di dunia.</string>
+    <string name="beta">BETA</string>
+    <string name="send_feedback_threads_info">Utasan adalah fitur yang sedang dikerjakan dengan fitur baru dan asik. Kami ingin dengar masukan Anda!</string>
+    <string name="send_feedback_threads_title">Masukan Utasan Beta</string>
+    <string name="give_feedback_threads">Berikan masukan</string>
+    <string name="beta_title_bottom_sheet_action">BETA</string>
+    <string name="settings_presence_user_always_appears_offline_summary">Jika diaktifkan, Anda akan selalu terlihat luring kepada pengguna lain, bahkan ketika menggunakan aplikasi.</string>
+    <string name="settings_presence_user_always_appears_offline">Mode luring</string>
+    <string name="settings_presence">Presensi</string>
+    <string name="threads_labs_enable_notice_message">Homeserver Anda saat ini tidak mendukung utasan, jadi fitur ini mungkin tidak andal. Beberapa pesan yang diutas mungkin tidak tersedia. %sApakah Anda ingin mengaktifkan utasan saja\?</string>
+    <string name="threads_labs_enable_notice_title">Utasan Beta</string>
+    <string name="threads_beta_enable_notice_message">Utasan membantu percakapan sesuai topik dan mudah untuk dilacak. %sMengaktifkan utasan akan memuat aplikasi ulang. Ini mungkin membutuhkan beberapa waktu untuk beberapa akun.</string>
+    <string name="threads_beta_enable_notice_title">Utasan Beta</string>
+    <string name="action_learn_more">Pelajari lebih lanjut</string>
+    <string name="action_try_it_out">Coba</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-is/strings.xml b/vector/src/main/res/values-is/strings.xml
index 90446c8819..f052e88ee5 100644
--- a/vector/src/main/res/values-is/strings.xml
+++ b/vector/src/main/res/values-is/strings.xml
@@ -1350,7 +1350,7 @@
     <string name="settings_messages_by_bot">Skilaboð frá vélmennum</string>
     <string name="settings_room_invitations">Boð á spjallrás</string>
     <string name="settings_messages_containing_keywords">Stikkorð</string>
-    <string name="settings_mentions_at_room">\@spjallrás</string>
+    <string name="settings_mentions_at_room">\@room</string>
     <string name="settings_group_messages">Hópskilaboð</string>
     <string name="settings_messages_direct_messages">Bein skilaboð</string>
     <string name="settings_messages_containing_username">Notandanafnið mitt</string>
@@ -1446,7 +1446,7 @@
     <string name="room_settings_room_notifications_notify_me">Láta mig vita fyrir</string>
     <string name="settings_discovery_category">Uppgötvun</string>
     <string name="settings_room_upgrades">Uppfærslur spjallrásar</string>
-    <string name="settings_messages_at_room">Skilaboð sem innihalda @spjallrás</string>
+    <string name="settings_messages_at_room">Skilaboð sem innihalda @room</string>
     <string name="settings_when_rooms_are_upgraded">Þegar spjallrásir eru uppfærðar</string>
     <string name="space_settings_permissions_title">Heimildir svæðis</string>
     <string name="room_participants_ban_reason">Ástæða fyrir banni</string>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index d14aa3c671..66fff2077e 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -1519,7 +1519,9 @@
 \n
 \nPuoi annullare questa azione in qualsiasi momento nelle impostazioni generali.</string>
     <string name="room_participants_action_unignore_title">Non ignorare più</string>
-    <string name="room_participants_action_unignore_prompt_msg">Se non ignori più l\'utente vedrai di nuovo tutti i suoi messaggi.</string>
+    <string name="room_participants_action_unignore_prompt_msg">Se non ignori più l\'utente vedrai di nuovo tutti i suoi messaggi.
+\n
+\nNota che quest\'azione riavvierà l\'app e potrebbe richiedere del tempo.</string>
     <string name="room_participants_action_cancel_invite_title">Annulla invito</string>
     <string name="room_participants_action_cancel_invite_prompt_msg">Sei sicuro di voler annullare l\'invito per questo utente\?</string>
     <string name="room_participants_remove_title">Butta fuori l\'utente</string>
@@ -1959,7 +1961,7 @@
 \nRiprova più tardi, o chiedi a un amministratore della stanza di controllare se hai l\'accesso.</string>
     <string name="join_anyway">Unisciti comunque</string>
     <string name="join_space">Unisciti a uno Spazio</string>
-    <string name="create_space">Crea Spazio</string>
+    <string name="create_space">Crea spazio</string>
     <string name="skip_for_now">Per il momento, salta</string>
     <string name="share_space_link_message">Unisciti al mio Spazio %1$s %2$s</string>
     <string name="invite_just_to_this_room_desc">Non faranno parte di %s</string>
@@ -1998,7 +2000,7 @@
     <string name="create_spaces_choose_type_label">Che tipo di Spazio vuoi creare\?</string>
     <string name="your_private_space">Il tuo Spazio privato</string>
     <string name="your_public_space">Il tuo Spazio pubblico</string>
-    <string name="add_space">Aggiungi Spazio</string>
+    <string name="add_space">Aggiungi spazio</string>
     <string name="command_description_leave_room">Esci dalla stanza con un ID (o dalla stanza attuale se vuota)</string>
     <string name="command_description_join_space">Unisciti allo Spazio con un ID</string>
     <string name="command_description_create_space">Crea uno Spazio</string>
@@ -2429,4 +2431,51 @@
 \n
 \nSarà una transizione una-tantum, dato che le conversazioni ora sono parte delle specifiche di Matrix.</string>
     <string name="threads_notice_migration_title">I messaggi in conversazioni entrano in beta 🎉</string>
+    <string name="ftue_account_created_take_me_home">Portami a casa</string>
+    <string name="live_location_sharing_notification_description">Stai condividendo la posizione</string>
+    <string name="live_location_sharing_notification_title">Posizione in tempo reale di ${app_name}</string>
+    <string name="error_forbidden_digits_only_username">L\'homeserver non accetta nomi utente con solo numeri.</string>
+    <string name="ftue_personalize_skip_this_step">Salta questo passo</string>
+    <string name="ftue_personalize_submit">Salva e continua</string>
+    <string name="ftue_personalize_complete_subtitle">Le tue preferenze sono state salvate.</string>
+    <string name="ftue_personalize_complete_title">Tutto pronto!</string>
+    <string name="ftue_personalize_lets_go">Andiamo</string>
+    <string name="ftue_profile_picture_subtitle">Puoi cambiarla in qualsiasi momento.</string>
+    <string name="ftue_profile_picture_title">Aggiungi un\'immagine del profilo</string>
+    <string name="ftue_display_name_entry_footer">Puoi cambiarlo in seguito</string>
+    <string name="ftue_display_name_entry_title">Nome da mostrare</string>
+    <string name="ftue_display_name_subtitle">Verrà mostrato quando invii messaggi.</string>
+    <string name="ftue_display_name_title">Scegli un nome da mostrare</string>
+    <string name="ftue_account_created_subtitle">Il tuo account %s è stato creato.</string>
+    <string name="ftue_account_created_congratulations_title">Congratulazioni!</string>
+    <string name="ftue_account_created_personalize">Personalizza profilo</string>
+    <string name="action_disable">Disattiva</string>
+    <string name="location_share_live_started">Caricamento posizione in tempo reale…</string>
+    <string name="location_share_live_select_duration_option_3">8 ore</string>
+    <string name="location_share_live_select_duration_option_2">1 ora</string>
+    <string name="location_share_live_select_duration_option_1">15 minuti</string>
+    <string name="location_share_live_select_duration_title">Condividi la tua posizione in tempo reale per</string>
+    <string name="audio_message_file_size">(%1$s)</string>
+    <string name="audio_message_reply_content">%1$s (%2$s)</string>
+    <string name="error_audio_message_unable_to_play">Impossibile riprodurre %1$s</string>
+    <string name="a11y_pause_audio_message">Metti in pausa %1$s</string>
+    <string name="a11y_play_audio_message">Riproduci %1$s</string>
+    <string name="a11y_audio_playback_duration">%1$d minuti %2$d secondi</string>
+    <string name="a11y_audio_message_item">%1$s, %2$s, %3$s</string>
+    <string name="sent_live_location">Ha condiviso la sua posizione</string>
+    <string name="ftue_auth_carousel_workplace_body">${app_name} è ottimo anche per i luoghi di lavoro. È considerato affidabile dalle più sicure organizzazioni del mondo.</string>
+    <string name="beta">BETA</string>
+    <string name="send_feedback_threads_info">Le conversazioni sono ancora in sviluppo e ci saranno nuove funzionalità in arrivo, come le notifiche migliorate. Vorremmo sapere la tua opinione!</string>
+    <string name="send_feedback_threads_title">Feedback della beta conversazioni</string>
+    <string name="give_feedback_threads">Invia un feedback</string>
+    <string name="beta_title_bottom_sheet_action">BETA</string>
+    <string name="settings_presence_user_always_appears_offline_summary">Se attiva, apparirai sempre offline agli altri utenti, anche quando usi l\'applicazione.</string>
+    <string name="settings_presence_user_always_appears_offline">Modalità offline</string>
+    <string name="settings_presence">Presenza</string>
+    <string name="threads_labs_enable_notice_message">Il tuo homeserver attualmente non supporta i messaggi in conversazioni, perciò questa funzione sarà inaffidabile. Alcuni messaggi in conversazioni potrebbero non essere disponibili. %sVuoi attivare comunque le conversazioni\?</string>
+    <string name="threads_labs_enable_notice_title">Beta conversazioni</string>
+    <string name="threads_beta_enable_notice_message">Le conversazioni ti aiutano a tenere le tue discussioni in tema e rintracciabili. %sL\'attivazione ricaricherà l\'app. Potrebbe richiedere più tempo per alcuni account.</string>
+    <string name="threads_beta_enable_notice_title">Beta conversazioni</string>
+    <string name="action_learn_more">Maggiori informazioni</string>
+    <string name="action_try_it_out">Provalo</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-iw/strings.xml b/vector/src/main/res/values-iw/strings.xml
index 2e1f521ff1..d4eb42a095 100644
--- a/vector/src/main/res/values-iw/strings.xml
+++ b/vector/src/main/res/values-iw/strings.xml
@@ -1952,8 +1952,8 @@
     </plurals>
     <plurals name="missed_audio_call">
         <item quantity="one">שיחה שלא נענתה</item>
-        <item quantity="two">"%d שיחות  שלא נענו"</item>
-        <item quantity="many">"%d שיחות  שלא נענו"</item>
+        <item quantity="two">%d שיחות שלא נענו</item>
+        <item quantity="many">%d שיחות שלא נענו</item>
         <item quantity="other">שיחה שלא נענתה</item>
     </plurals>
     <string name="call_ringing">צלצול שיחה…</string>
@@ -2099,8 +2099,8 @@
     <plurals name="call_active_status">
         <item quantity="one">שיחה פעילה ·</item>
         <item quantity="two">%1$d שיחות פעילות ·</item>
-        <item quantity="many"/>
-        <item quantity="other"/>
+        <item quantity="many">%1$d שיחות פעילות ·</item>
+        <item quantity="other">%1$d שיחות פעילות ·</item>
     </plurals>
     <string name="call_only_active">שיחה פעילה (%1$s)</string>
     <string name="call_dial_pad_lookup_error">אירעה שגיאה בחיפוש מספר הטלפון</string>
@@ -2132,9 +2132,9 @@
     <string name="room_notification_two_users_are_typing">%1$s ו %2$s</string>
     <plurals name="notice_room_server_acl_changes">
         <item quantity="one">%d שינוי ברשימות ACL בשרתים</item>
-        <item quantity="two"/>
-        <item quantity="many"/>
-        <item quantity="other"/>
+        <item quantity="two">%d שינוים ברשימות ACL בשרתים</item>
+        <item quantity="many">%d שינוים ברשימות ACL בשרתים</item>
+        <item quantity="other">%d שינוים ברשימות ACL בשרתים</item>
     </plurals>
     <string name="space_settings_manage_rooms">נהל חדרים</string>
     <string name="decide_who_can_find_and_join">החלט מי יכול לראות ולהצטרף לחדר זה.</string>
diff --git a/vector/src/main/res/values-ja/strings.xml b/vector/src/main/res/values-ja/strings.xml
index e87e5653ca..49335373a0 100644
--- a/vector/src/main/res/values-ja/strings.xml
+++ b/vector/src/main/res/values-ja/strings.xml
@@ -355,7 +355,7 @@
     <plurals name="membership_changes">
         <item quantity="other">%d個のメンバーシップの変更</item>
     </plurals>
-    <string name="list_members">メンバーを表示</string>
+    <string name="list_members">メンバー</string>
     <plurals name="room_title_members">
         <item quantity="other">%d名のメンバー</item>
     </plurals>
@@ -512,7 +512,7 @@
     <string name="settings_security_and_privacy">セキュリティーとプライバシー</string>
     <string name="preference_root_help_about">ヘルプと概要</string>
     <string name="bottom_action_people_x">ダイレクトメッセージ</string>
-    <string name="edited_suffix">（編集済）</string>
+    <string name="edited_suffix">（編集した）</string>
     <string name="room_filtering_filter_hint">会話を検索…</string>
     <string name="room_list_quick_actions_notifications_all_noisy">全てのメッセージ (音量大)</string>
     <string name="room_list_quick_actions_notifications_all">全てのメッセージ</string>
@@ -962,7 +962,7 @@
     <string name="settings_integrations">インテグレーション（統合）</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">アプリがバックグラウンドにある場合、着信メッセージは通知されません。</string>
     <string name="settings_background_fdroid_sync_mode_real_time_description">${app_name}は正確な時間に定期的にバックグラウンドで同期します（構成可能）。
-\nこれは無線とバッテリーの使用量に影響し、$ {app_name}がイベントを待機していることを示す永続的な通知が表示されます。</string>
+\nこれは無線とバッテリーの使用量に影響し、${app_name}がイベントを待機していることを示す永続的な通知が表示されます。</string>
     <string name="settings_background_fdroid_sync_mode_battery_description">${app_name}は、端末の限られたリソース（バッテリーの残量）を維持する方法でバックグラウンド同期をします。
 \n端末の状態によっては、OSによって同期が延期される場合があります。</string>
     <string name="settings_system_preferences_summary">LEDの色、振動、音を選択してください…</string>
@@ -1520,7 +1520,7 @@
     <string name="delete_poll_dialog_title">アンケートを削除</string>
     <string name="create_space">スペースを作成</string>
     <string name="join_space">スペースに参加</string>
-    <string name="leave_space">スペースを退出</string>
+    <string name="leave_space">退出</string>
     <string name="space_settings_manage_rooms">ルームを管理</string>
     <string name="this_space_has_no_rooms">このスペースにはルームがありません</string>
     <string name="error_voice_message_unable_to_play">音声メッセージを再生できません</string>
@@ -2342,4 +2342,34 @@
     <string name="set_a_security_phrase_notice">あなたしか知らないセキュリティーフレーズを入力してください。サーバーで機密情報を保護するために使用します。</string>
     <string name="message_reaction_show_less">詳細を非表示</string>
     <string name="invite_people_to_your_space_desc">他の参加者はいません。%sに招待しましょう。</string>
-</resources>
\ No newline at end of file
+    <string name="location_share_live_enabled">位置情報（ライブ）が有効です</string>
+    <string name="location_in_background_missing_permission_dialog_title">アクセスを許可</string>
+    <string name="a11y_location_share_option_user_current_icon">現在の位置情報を共有</string>
+    <string name="location_share_option_user_current">現在の位置情報を共有</string>
+    <string name="create_spaces_room_public_header_desc">ルームを作成します。後から追加できます。</string>
+    <plurals name="entries">
+        <item quantity="other">%d個のエントリー</item>
+    </plurals>
+    <string name="ftue_personalize_submit">保存して続行</string>
+    <string name="ftue_personalize_complete_subtitle">設定を保存しました。</string>
+    <string name="ftue_profile_picture_subtitle">これは後から変更できます。</string>
+    <string name="ftue_profile_picture_title">プロフィール画像を追加</string>
+    <string name="ftue_display_name_entry_footer">これは後から変更できます</string>
+    <string name="ftue_display_name_entry_title">表示名</string>
+    <string name="ftue_display_name_subtitle">メッセージを送信する際に表示されます。</string>
+    <string name="a11y_location_share_option_pinned_icon">この位置情報を共有</string>
+    <string name="location_share_option_pinned">この位置情報を共有</string>
+    <string name="a11y_location_share_option_user_live_icon">位置情報（ライブ）を共有</string>
+    <string name="location_share_option_user_live">位置情報（ライブ）を共有</string>
+    <string name="location_share_live_stop">中止</string>
+    <string name="ftue_display_name_title">表示名を選択</string>
+    <string name="ftue_account_created_subtitle">あなたのアカウント %s が作成されました。</string>
+    <string name="ftue_account_created_congratulations_title">おめでとうございます！</string>
+    <string name="threads_notice_migration_message">近日中にスレッドはベータ版となります。
+\n
+\nその準備として、この時点以前に作成されたスレッドは、通常の返信として表示するように変更します。
+\n
+\nスレッドはMatrixの仕様の一部になったため、これは一度限りの変更です。</string>
+    <string name="threads_notice_migration_title">スレッドはベータ版になります 🎉</string>
+    <string name="action_disable">無効にする</string>
+</resources>
diff --git a/vector/src/main/res/values-ko/strings.xml b/vector/src/main/res/values-ko/strings.xml
index 900fa23a1c..b57bfd40d7 100644
--- a/vector/src/main/res/values-ko/strings.xml
+++ b/vector/src/main/res/values-ko/strings.xml
@@ -20,10 +20,10 @@
     <string name="notice_placed_voice_call">%s님이 음성 통화를 걸었습니다.</string>
     <string name="notice_answered_call">%s님이 전화를 받았습니다.</string>
     <string name="notice_ended_call">%s님이 전화를 끊었습니다.</string>
-    <string name="notice_made_future_room_visibility">%1$s님이 이후 %2$s에게 방 기록을 공개했습니다</string>
-    <string name="notice_room_visibility_invited">초대된 시점부터 모든 방 구성원.</string>
-    <string name="notice_room_visibility_joined">들어온 시점부터 모든 방 구성원.</string>
-    <string name="notice_room_visibility_shared">모든 방 구성원.</string>
+    <string name="notice_made_future_room_visibility">%1$s님이 이 시점 이후 방 기록을 %2$s님이 볼 수 있도록 공개했습니다</string>
+    <string name="notice_room_visibility_invited">방 참여자 모두, 다만 초대받은 시점부터.</string>
+    <string name="notice_room_visibility_joined">방 참여자 모두, 다만 들어온 시점부터.</string>
+    <string name="notice_room_visibility_shared">방 참여자 모두.</string>
     <string name="notice_room_visibility_world_readable">누구나.</string>
     <string name="notice_room_update">%s님이 방을 업그레이드했습니다.</string>
     <string name="notice_avatar_changed_too">(아바타도 변경됨)</string>
@@ -39,7 +39,6 @@
     <string name="medium_phone_number">전화번호</string>
     <string name="room_displayname_room_invite">방 초대</string>
     <string name="room_displayname_two_members">%1$s님과 %2$s님</string>
-
     <string name="room_displayname_empty_room">빈 방</string>
     <string name="initial_sync_start_importing_account">초기 동기화:
 \n계정 가져오는 중…</string>
@@ -134,7 +133,6 @@
     <string name="done">완료</string>
     <string name="action_sign_out_confirmation_simple">정말 로그아웃하시겠습니까\?</string>
     <string name="action_mark_room_read">읽음으로 표시</string>
-
     <string name="groups_header">커뮤니티</string>
     <string name="send_bug_report_app_crashed">최근에 애플리케이션이 충돌한 것 같습니다. 충돌 보고서를 열까요\?</string>
     <string name="username">사용자 이름</string>
@@ -145,7 +143,6 @@
     <string name="auth_invalid_login_param">알맞지 않은 사용자 이름이나 비밀번호</string>
     <string name="auth_invalid_email">올바른 이메일 주소가 아닙니다</string>
     <string name="auth_forgot_password">비밀번호를 잊어버리셨나요\?</string>
-
     <string name="notification_listening_for_events">이벤트 청취하기</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">키 백업이 진행 중입니다. 지금 로그아웃하면 암호화된 메시지에 접근할 수 없습니다.</string>
     <string name="sign_out_bottom_sheet_warning_backup_not_active">암호화된 메시지에 대한 접근을 읽지 않도록 모든 장치에서 보안 키 백업이 활성화되어 있어야 합니다.</string>
@@ -153,7 +150,6 @@
     <string name="sign_out_bottom_sheet_backing_up_keys">키 백업 중…</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">로그아웃하기 전에 키를 백업하지 않으면 암호화된 메시지에 접근할 수 없습니다.</string>
     <string name="later">후</string>
-
     <string name="action_accept">수락하기</string>
     <string name="action_ignore">차단</string>
     <string name="invitations_header">초대</string>
@@ -168,7 +164,6 @@
     <string name="error_no_external_application_found">죄송합니다, 이 작업을 완료하기 위한 외부 애플리케이션이 없습니다.</string>
     <string name="auth_login_sso">통합 인증으로 로그인</string>
     <string name="auth_email_already_defined">이 이메일 주소는 이미 정의되었습니다.</string>
-
     <string name="auth_recaptcha_message">이 홈서버는 당신이 로봇인지 아닌 지를 확인하고 싶습니다</string>
     <string name="auth_reset_password_missing_email">계정에 연결된 이메일 주소를 입력해야 합니다.</string>
     <string name="auth_reset_password_error_unauthorized">이메일 주소를 확인할 수 없습니다: 이메일에 있는 링크를 클릭했는 지 확인하세요</string>
@@ -199,14 +194,10 @@
     <string name="video_call_in_progress">영상 통화 진행 중…</string>
     <string name="call_error_user_not_responding">상대방이 전화를 받지 못했습니다.</string>
     <string name="permissions_rationale_popup_title">정보</string>
-
-
     <string name="permissions_rationale_msg_record_audio">음성 통화를 하려면 ${app_name}은 마이크에 접근하는 권한이 필요합니다.</string>
-
     <string name="permissions_rationale_msg_camera_and_audio">영상 통화를 하려면 ${app_name}은 카메라와 마이크에 접근하는 권한이 필요합니다.
 \n
 \n전화를 하려면 다음 팝업에서 접근을 허용해주세요.</string>
-
     <string name="yes">네</string>
     <string name="no">아니오</string>
     <string name="_continue">계속</string>
@@ -215,15 +206,9 @@
     <string name="action_reject">받지 않기</string>
     <string name="list_members">구성원 목록</string>
     <string name="room_jump_to_first_unread">읽지 않은 첫 부분으로 이동하기.</string>
-
-
     <plurals name="room_title_members">
         <item quantity="other">%d명의 구성원</item>
     </plurals>
-
-
-
-
     <string name="room_participants_leave_prompt_title">방 떠나기</string>
     <string name="room_participants_leave_prompt_msg">방을 떠나겠습니까\?</string>
     <string name="room_participants_header_direct_chats">다이렉트 대화</string>
@@ -258,12 +243,9 @@
     <plurals name="room_details_selected">
         <item quantity="other">%d개 선택됨</item>
     </plurals>
-
     <string name="search_hint">검색</string>
     <string name="search_members_hint">방 구성원 필터</string>
     <string name="search_no_results">결과 없음</string>
-
-
     <string name="room_settings_all_messages">모든 메시지</string>
     <string name="room_settings_add_homescreen_shortcut">홈 화면에 단축 아이콘 추가</string>
     <string name="settings_profile_picture">프로필 사진</string>
@@ -396,7 +378,6 @@
     <string name="settings_send_message_with_enter_summary">가상 키보드의 엔터 버튼으로 줄 바꿈을 하는 대신 메시지를 보냅니다</string>
     <string name="settings_deactivate_account_section">계정 비활성화</string>
     <string name="settings_deactivate_my_account">내 계정 비활성화</string>
-
     <string name="settings_analytics">정보 분석</string>
     <string name="settings_opt_in_of_analytics">정보 분석 데이터 보내기</string>
     <string name="settings_opt_in_of_analytics_summary">${app_name}은 애플리케이션을 개선할 수 있도록 익명의 분석을 수집합니다.</string>
@@ -405,7 +386,6 @@
     <string name="devices_details_device_name">공개 이름 업데이트</string>
     <string name="devices_details_last_seen_title">마지막으로 본 순간</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
-
     <string name="devices_delete_dialog_title">인증</string>
     <string name="settings_logged_in">이것으로 로그인</string>
     <string name="settings_home_server">홈서버</string>
@@ -453,7 +433,6 @@
     <string name="room_settings_labs_warning_message">예기치 않은 방식으로 중단될 수 있는 실험적인 기능들입니다. 주의해서 사용하세요.</string>
     <string name="room_settings_set_main_address">메인 주소로 설정</string>
     <string name="room_settings_unset_main_address">메인 주소로 설정 해제</string>
-
     <string name="settings_theme">테마</string>
     <string name="encryption_information_decryption_error">암호 복호화 오류</string>
     <string name="encryption_information_device_name">공개 이름</string>
@@ -464,7 +443,6 @@
     <string name="encryption_export_room_keys_summary">로컬 파일로 키 내보내기</string>
     <string name="encryption_export_export">내보내기</string>
     <string name="encryption_export_notice">내보낸 키를 암호화하는 암호를 만드세요. 키를 가져오려면 같은 암호를 입력해야 합니다.</string>
-
     <string name="encryption_message_recovery">암호화된 메시지 복구</string>
     <string name="encryption_settings_manage_message_recovery_summary">키 백업 관리</string>
     <string name="encryption_import_e2e_room_keys">종단간 암호화 방 키 가져오기</string>
@@ -479,7 +457,6 @@
     <string name="encryption_information_verify">확인</string>
     <string name="encryption_information_verify_device_warning">이 기기가 신뢰할 수 있는 지 확인하려면, 다른 방법을 사용하여 소유자에게 연락하세요 (예: 현실에서 혹은 전화로) 그리고 이 기기의 사용자 설정에서 표시된 키가 아래에 있는 키와 맞는지 물어보세요:</string>
     <string name="encryption_information_verify_device_warning2">그것이 맞다면, 아래의 확인 버튼을 누르세요. 맞지 않다면, 다른 사람이 이 기기를 가로채고 있는 것이고 블랙리스트에 올려야 합니다. 앞으로 이 확인 절차는 더 정교해질 것입니다.</string>
-
     <string name="select_room_directory">방 목록 선택</string>
     <string name="directory_server_placeholder">홈서버 URL</string>
     <string name="directory_server_all_rooms_on_server">%s 서버의 모든 방</string>
@@ -487,7 +464,6 @@
     <plurals name="notification_unread_notified_messages">
         <item quantity="other">%d개의 읽지 않은 알림 메시지</item>
     </plurals>
-
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="other">%d개의 방</item>
     </plurals>
@@ -569,8 +545,6 @@
     <string name="group_details_home">홈</string>
     <string name="rooms">방</string>
     <string name="invited">초대받음</string>
-
-
     <string name="has_been_removed">%2$s님에 의해 %1$s 방에서 추방당했습니다</string>
     <string name="has_been_banned">%2$s님에 의해 %1$s 방에서 출입 금지당했습니다</string>
     <string name="reason_colon">이유: %1$s</string>
@@ -636,7 +610,6 @@
     <string name="keys_backup_setup_step3_copy_button_title">복구 키 저장</string>
     <string name="keys_backup_setup_step3_share_recovery_file">공유</string>
     <string name="keys_backup_setup_step3_save_button_title">파일로 저장</string>
-
     <string name="keys_backup_setup_override_backup_prompt_tile">백업이 이미 홈서버에 존재합니다</string>
     <string name="keys_backup_setup_override_backup_prompt_description">이미 키 백업을 다른 기기에 설정한 모양입니다. 만들고 있는 것으로 바꾸겠습니까\?</string>
     <string name="keys_backup_setup_override_replace">바꾸기</string>
@@ -687,7 +660,6 @@
     <string name="keys_backup_settings_checking_backup_state">백업 상태 확인하기</string>
     <string name="keys_backup_settings_delete_confirm_title">백업 삭제</string>
     <string name="keys_backup_settings_delete_confirm_message">서버에서 백업한 암호화 키를 삭제하겠습니까\? 더 이상 복구 키를 사용해 암호화된 메시지 기록을 읽을 수 없습니다.</string>
-
     <string name="keys_backup_banner_recover_line1">암호화된 메시지를 잃지 마세요</string>
     <string name="keys_backup_banner_recover_line2">키 백업하기</string>
     <string name="keys_backup_banner_update_line1">새 암호화된 메시지 키</string>
@@ -700,11 +672,8 @@
     <string name="keys_backup_info_title_version">버전</string>
     <string name="keys_backup_info_title_algorithm">알고리즘</string>
     <string name="keys_backup_info_title_signature">서명</string>
-
     <string name="sas_verified">확인되었습니다!</string>
     <string name="sas_got_it">알겠습니다</string>
-
-
     <string name="sas_incoming_request_notif_title">확인 요청</string>
     <string name="sas_incoming_request_notif_content">%s님이 당신의 기기를 확인하고 싶습니다</string>
     <string name="sas_error_unknown">알 수 없는 오류</string>
@@ -795,7 +764,6 @@
     <string name="none">없음</string>
     <string name="action_revoke">취소</string>
     <string name="action_disconnect">연결 해제</string>
-
     <string name="login_error_homeserver_not_found">이 URL로는 홈서버에 접근할 수 없습니다, 확인해주세요</string>
     <string name="settings_background_fdroid_sync_mode">백그라운드 동기화 모드 (실험적)</string>
     <string name="settings_background_fdroid_sync_mode_battery">배터리에 최적화됨</string>
@@ -806,7 +774,6 @@
 \n이는 라디오와 배터리 사용에 영향을 주며 ${app_name}이 이벤트를 수신하고 있는 상태라는 알림이 영구적으로 표시됩니다.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">백그라운드 동기화 없음</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">앱이 백그라운드에 있을 때 수신 메시지의 알림을 받지 않습니다.</string>
-
     <string name="settings_discovery_category">탐색</string>
     <string name="settings_discovery_manage">탐색 설정을 관리합니다.</string>
     <string name="identity_server_not_defined">ID 서버를 사용하고 있지 않습니다</string>
@@ -875,7 +842,6 @@
     <string name="content_reported_as_inappropriate_content">이 내용을 부적절한 문자로 신고했습니다.
 \n
 \n이 사용자의 내용을 더 이상 보고 싶지 않다면, 사용자를 차단하거나 메시지를 감출 수 있습니다.</string>
-
     <string name="settings_integrations">통합</string>
     <string name="settings_integration_allow">통합 수락</string>
     <string name="create_space_topic_hint">설명</string>
@@ -982,4 +948,21 @@
     <string name="notice_room_topic_changed_by_you">주제를 다음으로 변경했습니다: %1$s</string>
     <string name="notice_display_name_removed_by_you">표시 이름을 삭제했습니다 (이전 이름: %1$s)</string>
     <string name="notice_display_name_changed_from_by_you">표시 이름을 %1$s에서 %2$s(으)로 변경했습니다</string>
+    <string name="notice_room_server_acl_set_title_by_you">서버 접근제어목록을 설정했습니다.</string>
+    <string name="notice_room_server_acl_set_title">%s님이 서버 접근제어목록을 설정했습니다.</string>
+    <string name="notice_direct_room_update_by_you">이곳을 업그레이드했습니다.</string>
+    <string name="notice_direct_room_update">%s님이 이곳을 업그레이드했습니다.</string>
+    <string name="notice_room_update_by_you">방을 업그레이드했습니다.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">이 시점 이후 메시지를 %1$s님이 볼 수 있도록 공개했습니다</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s님이 이 시점 이후 메시지를 %2$s님이 볼 수 있도록 공개했습니다</string>
+    <string name="notice_made_future_room_visibility_by_you">이 시점 이후 방 기록을 %1$s님이 볼 수 있도록 공개했습니다</string>
+    <string name="notice_ended_call_by_you">전화를 끊었습니다.</string>
+    <string name="notice_answered_call_by_you">전화를 받았습니다.</string>
+    <string name="notice_call_candidates_by_you">통화 연결을 위한 데이터를 보냈습니다.</string>
+    <string name="notice_call_candidates">%s님이 통화 연결을 위한 데이터를 보냈습니다.</string>
+    <string name="notice_placed_voice_call_by_you">음성 통화를 시작했습니다.</string>
+    <string name="notice_placed_video_call_by_you">영상 통화를 시작했습니다.</string>
+    <string name="notice_room_name_changed_by_you">방 이름을 바꾸었습니다: %1$s</string>
+    <string name="notice_room_avatar_changed_by_you">방 사진을 바꾸었습니다</string>
+    <string name="notice_room_avatar_changed">%1$s님이 방 사진을 바꾸었습니다</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-lo/strings.xml b/vector/src/main/res/values-lo/strings.xml
new file mode 100644
index 0000000000..72b2ae1d21
--- /dev/null
+++ b/vector/src/main/res/values-lo/strings.xml
@@ -0,0 +1,2323 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="settings_troubleshoot_test_token_registration_title">ການລົງທະບຽນ Token</string>
+    <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">ເພີ່ມບັນຊີ</string>
+    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nຂໍ້ຜິດພາດນີ້ບໍ່ສາມາດຄວບຄຸມໄດ້ຂອງ ${app_name}. ບໍ່ມີບັນຊີ Google ຢູ່ໃນໂທລະສັບ. ກະລຸນາເປີດຕົວຈັດການບັນຊີ ແລະເພີ່ມບັນຊີ Google.</string>
+    <string name="settings_troubleshoot_test_fcm_failed">ດຶງຂໍ້ມູນໂທເຄັນ FCMບໍ່ສຳເລັດ:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_fcm_success">ດຶງຂໍ້ມູນໂທເຄັນ FCM ສຳເລັດແລ້ວ:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_fcm_title">Firebase Token</string>
+    <string name="settings_troubleshoot_test_play_services_quickfix">ແກ້ໄຂບໍລິການຫຼິ້ນ</string>
+    <string name="settings_troubleshoot_test_play_services_failed">${app_name} ໃຊ້ Google Play Services ເພື່ອສົ່ງຂໍ້ຄວາມ ແຕ່ເບິ່ງຄືວ່າບໍ່ໄດ້ຖືກຕັ້ງຄ່າຢ່າງຖືກຕ້ອງ:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK ສາມາດໃຊ້ໄດ້ ແລະ ອັບເດດແລ້ວ.</string>
+    <string name="settings_troubleshoot_test_play_services_title">ກວດສອບບໍລິການການຫຼິ້ນ</string>
+    <string name="settings_troubleshoot_test_bing_settings_failed">ການແຈ້ງເຕືອນບາງລາຍການຖືກປິດໃຊ້ງານໃນການຕັ້ງຄ່າແບບກຳນົດເອງຂອງທ່ານ.</string>
+    <string name="settings_troubleshoot_test_bing_settings_success_with_warn">ສັງເກດເຫັນວ່າຂໍ້ຄວາມບາງປະເພດໄດ້ຖືກຕັ້ງໃຫ້ເປັນແບບບໍ່ມີສຽງ (ຈະສ້າງການແຈ້ງການທີ່ບໍ່ມີສຽງ).</string>
+    <string name="settings_troubleshoot_test_bing_settings_title">ການຕັ້ງຄ່າແບບກຳນົດເອງ.</string>
+    <string name="settings_troubleshoot_test_device_settings_quickfix">ເປີດໃຊ້</string>
+    <string name="settings_troubleshoot_test_device_settings_failed">ບໍ່ໄດ້ເປີດໃຊ້ການແຈ້ງເຕືອນສຳລັບລະບົບນີ້.
+\nກະລຸນາກວດເບິ່ງການຕັ້ງຄ່າ ${app_name}.</string>
+    <string name="settings_troubleshoot_test_device_settings_success">ການແຈ້ງເຕືອນຖືກເປີດໃຊ້ງານສໍາລັບລະບົບນີ້.</string>
+    <string name="settings_troubleshoot_test_device_settings_title">ການຕັ້ງຄ່າລະບົບ.</string>
+    <string name="settings_troubleshoot_test_account_settings_quickfix">ເປີດໃຊ້</string>
+    <string name="settings_troubleshoot_test_account_settings_failed">ການແຈ້ງເຕືອນຖືກປິດການນຳໃຊ້ສຳລັບບັນຊີຂອງທ່ານ.
+\nກະລຸນາກວດເບິ່ງການຕັ້ງຄ່າບັນຊີ.</string>
+    <string name="settings_troubleshoot_test_account_settings_success">ການແຈ້ງເຕືອນຖືກເປີດໃຊ້ງານສຳລັບບັນຊີຂອງທ່ານ.</string>
+    <string name="settings_troubleshoot_test_account_settings_title">ຕັ້ງຄ່າບັນຊີ.</string>
+    <string name="open_settings">ເປີດການຕັ້ງຄ່າ</string>
+    <string name="settings_troubleshoot_test_system_settings_failed">ການແຈ້ງເຕືອນຖືກປິດໃຊ້ງານຢູ່ໃນການຕັ້ງຄ່າລະບົບ.
+\nກະລຸນາກວດເບິ່ງການຕັ້ງຄ່າລະບົບ.</string>
+    <string name="settings_troubleshoot_test_system_settings_success">ການແຈ້ງເຕືອນຖືກເປີດໃຊ້ໃນການຕັ້ງຄ່າລະບົບ.</string>
+    <string name="settings_troubleshoot_test_system_settings_title">ການຕັ້ງຄ່າລະບົບ.</string>
+    <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">ການທົດສອບໜຶ່ງ ຫຼື ຫຼາຍກວ່ານັ້ນບໍ່ສຳເລັດ, ກະລຸນາສົ່ງລາຍງານຂໍ້ຜິດພາດເພື່ອຊ່ວຍພວກເຮົາກວດສອບ.</string>
+    <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">ການທົດສອບຫນຶ່ງ ຫຼື ຫຼາຍກວ່ານັ້ນບໍ່ສຳເລັດ, ລອງວິທີແກ້ໄຂທີ່ໄດ້ແນະນໍາ.</string>
+    <string name="settings_troubleshoot_diagnostic_success_status">ການວິນິດໄສພື້ນຖານແມ່ນ OK. ຖ້າທ່ານຍັງບໍ່ໄດ້ຮັບການແຈ້ງເຕືອນ, ກະລຸນາສົ່ງລາຍງານຂໍ້ຜິດພາດເພື່ອຊ່ວຍພວກເຮົາສືບສວນ.</string>
+    <string name="settings_troubleshoot_diagnostic_running_status">ກຳລັງດຳເນິນການ… (%1$d ຂອງ %2$d)</string>
+    <string name="settings_troubleshoot_diagnostic_run_button_title">ດໍາເນີນການທົດສອບ</string>
+    <string name="settings_troubleshoot_diagnostic">ການແກ້ໄຂບັນຫາດ້ວຍການວິນິດໄສ</string>
+    <string name="settings_notification_troubleshoot">ແກ້ໄຂບັນຫາການແຈ້ງເຕືອນ</string>
+    <string name="settings_notification_keyword_contains_invalid_character">ຄໍາສໍາຄັນບໍ່ສາມາດມີ \'%s\'</string>
+    <string name="settings_notification_keyword_contains_dot">ຄໍາສໍາຄັນບໍ່ສາມາດເລີ່ມຕົ້ນດ້ວຍ \'.\'</string>
+    <string name="settings_notification_new_keyword">ເພີ່ມຄໍາສໍາຄັນໃຫມ່</string>
+    <string name="settings_notification_your_keywords">ຄໍາສໍາຄັນຂອງທ່ານ</string>
+    <string name="settings_notification_notify_me_for">ແຈ້ງໃຫ້ຂ້າພະເຈົ້າຊາບສໍາລັບ</string>
+    <string name="settings_notification_other">ອື່ນໆ</string>
+    <string name="settings_notification_mentions_and_keywords">ການກ່າວເຖິງແລະຄໍາສໍາຄັນ</string>
+    <string name="settings_notification_default">ການແຈ້ງເຕືອນເລີ່ມຕົ້ນ</string>
+    <string name="settings_notification_emails_enable_for_email">ເປີດໃຊ້ການແຈ້ງເຕືອນອີເມວສຳລັບ %s</string>
+    <string name="settings_notification_emails_no_emails">ເພື່ອຮັບອີເມວພ້ອມການແຈ້ງເຕືອນ, ກະລຸນາເຊື່ອມຕໍ່ອີເມວເຂົ້າບັນຊີ Matrix ຂອງທ່ານ</string>
+    <string name="settings_notification_emails_category">ການແຈ້ງເຕືອນທາງອີເມວ</string>
+    <string name="settings_notification_by_event">ຄວາມສຳຄັນຂອງການແຈ້ງເຕືອນຕາມເຫດການ</string>
+    <string name="settings_notification_advanced">ການຕັ້ງຄ່າການແຈ້ງເຕືອນຂັ້ນສູງ</string>
+    <string name="error_threepid_auth_failed">ໃຫ້ແນ່ໃຈວ່າທ່ານໄດ້ກົດໃສ່ການເຊື່ອມຕໍ່ໃນອີເມວທີ່ພວກເຮົາໄດ້ສົ່ງໃຫ້ທ່ານ.</string>
+    <string name="settings_remove_three_pid_confirmation_content">ລຶບ ອອກບໍ%s\?</string>
+    <string name="settings_phone_numbers">ເບີໂທລະສັບ</string>
+    <string name="settings_emails_empty">ບໍ່ມີອີເມວໃດຖືກເພີ່ມໃສ່ບັນຊີຂອງທ່ານ</string>
+    <string name="settings_emails">ທີ່ຢູ່ອີເມວ</string>
+    <string name="settings_app_info_link_summary">ສະແດງຂໍ້ມູນລະບົບການຕັ້ງຄ່າແອັບພລິເຄຊັນ.</string>
+    <string name="settings_app_info_link_title">ຂໍ້ມູນການສະຫມັກ</string>
+    <string name="settings_add_phone_number">ເພີ່ມເບີໂທລະສັບ</string>
+    <string name="settings_phone_number_empty">ບໍ່ມີເບີໂທລະສັບທີ່ຖືກເພີ່ມໃສ່ບັນຊີຂອງທ່ານ</string>
+    <string name="settings_add_email_address">ເພີ່ມທີ່ຢູ່ອີເມວ</string>
+    <string name="settings_display_name">ສະແດງຊື່</string>
+    <string name="settings_profile_picture">ຮູບໂປຣໄຟລ໌</string>
+    <string name="shortcut_disabled_reason_sign_out">ໄດ້ອອກຈາກລະບົບແລ້ວ!</string>
+    <string name="shortcut_disabled_reason_room_left">ອອກຈາກຫ້ອງແລ້ວ!</string>
+    <string name="room_settings_add_homescreen_shortcut">ເພີ່ມໃສ່ໜ້າຈໍຫຼັກ</string>
+    <string name="room_settings_none">ບໍ່ມີ</string>
+    <string name="room_settings_mention_and_keyword_only">ການກ່າວເຖິງ &amp; ຄຳສັບສຳຄັນເທົ່ານັ້ນ</string>
+    <string name="room_settings_all_messages">ຂໍ້ຄວາມທັງໝົດ</string>
+    <string name="search_no_results">ບໍ່ມີຜົນ</string>
+    <string name="search_banned_user_hint">ການກັ່ນຕອງຫ້າມຜູ້ໃຊ້</string>
+    <string name="search_members_hint">ການກັ່ນຕອງສະມາຊິກຫ້ອງ</string>
+    <string name="search_hint">ຊອກຫາ</string>
+    <string name="threads_labs_enable_notice_message">homeserver ຂອງທ່ານບໍ່ຮອງຮັບກະທູ້ໃນປັດຈຸບັນ, ດັ່ງນັ້ນຄຸນສົມບັດນີ້ອາດຈະບໍ່ໜ້າເຊື່ອຖື. ບາງຂໍ້ຄວາມທີ່ເປັນກະທູ້ອາດຈະບໍ່ມີຄວາມໜ້າເຊື່ອຖືໄດ້. %sທ່ານຕ້ອງການເປີດໃຊ້ຫົວຂໍ້ແນວໃດ\?</string>
+    <string name="threads_labs_enable_notice_title">ກະທູ້ເບຕ້າ</string>
+    <string name="threads_beta_enable_notice_message">ກະທູ້ຊ່ວຍໃຫ້ການສົນທະນາຂອງທ່ານຢູ່ໃນຫົວຂໍ້ແລະງ່າຍຕໍ່ການຕິດຕາມ. %s ການເປີດໃຊ້ງານກະທູ້ຈະໂຫຼດແອັບຄືນໃໝ່. ອັນນີ້ອາດຈະໃຊ້ເວລາດົນກວ່າສໍາລັບບາງບັນຊີ.</string>
+    <string name="threads_beta_enable_notice_title">ກະທູ້ເບຕ້າ</string>
+    <string name="threads_notice_migration_message">ພວກເຮົາໃກ້ຈະອອກ ຈາກກະທູ້ Beta ສາທາລະນະ.
+\n
+\nໃນຂະນະທີ່ພວກເຮົາກະກຽມສໍາລັບສິ່ງນີ້, ພວກເຮົາຈໍາເປັນຕ້ອງເຮັດການປ່ຽນແປງບາງຢ່າງ: ກະທູ້ທີ່ສ້າງຂຶ້ນກ່ອນນີ້ຈະຖືກສະແດງເປັນການຕອບປົກກະຕິ.
+\n
+\nສິ່ງນີ້ຈະເປັນການປ່ຽນແປງຄັ້ງດຽວເນື່ອງຈາກກະທູ້ເປັນສ່ວນໜຶ່ງຂອງຂໍ້ມູນສະເພາະຂອງ Matrix.</string>
+    <string name="threads_notice_migration_title">ກະທູ້ໃກ້ຮອດເບຕ້າ 🎉</string>
+    <string name="search_thread_from_a_thread">ຈາກກະທູ້</string>
+    <string name="thread_list_empty_notice">ຄຳແນະນຳ: ແຕະໃສ່ຂໍ້ຄວາມດົນໆ ແລະໃຊ້ “%s”.</string>
+    <string name="thread_list_empty_subtitle">ກະທູ້ຊ່ວຍໃຫ້ການສົນທະນາຂອງທ່ານຢູ່ໃນຫົວຂໍ້ ແລະ ງ່າຍຕໍ່ການຕິດຕາມ.</string>
+    <string name="thread_list_empty_title">ຈັດລະບຽບການສົນທະນາດ້ວຍກະທູ້</string>
+    <string name="thread_list_modal_my_threads_subtitle">ສະແດງຫົວຂໍ້ທັງໝົດທີ່ທ່ານໄດ້ເຂົ້າຮ່ວມ</string>
+    <string name="thread_list_modal_my_threads_title">ກະທູ້ຂອງຂ້ອຍ</string>
+    <string name="thread_list_modal_all_threads_subtitle">ສະແດງຫົວຂໍ້ທັງໝົດຈາກຫ້ອງປັດຈຸບັນ</string>
+    <string name="thread_list_modal_all_threads_title">ກະທູ້ທັງໝົດ</string>
+    <string name="thread_list_modal_title">ການກັ່ນຕອງ</string>
+    <string name="thread_list_title">ກະທູ້</string>
+    <string name="thread_timeline_title">ກະທູ້</string>
+    <string name="room_threads_filter">ການກັ່ນຕອງກະທູ້ຢູ່ໃນຫ້ອງ</string>
+    <plurals name="room_details_selected">
+        <item quantity="other">ເລືອກ %d ແລ້ວ</item>
+    </plurals>
+    <string name="room_permissions_change_topic">ປ່ຽນຫົວຂໍ້</string>
+    <string name="room_permissions_upgrade_the_space">ຍົກລະດັບພື້ນທີ່</string>
+    <string name="room_permissions_upgrade_the_room">ຍົກລະດັບຫ້ອງ</string>
+    <string name="room_permissions_send_m_room_server_acl_events">ສົ່ງເຫດການ m.room.server_acl</string>
+    <string name="room_permissions_change_permissions">ປ່ຽນການອະນຸຍາດ</string>
+    <string name="room_permissions_change_space_name">ປ່ຽນຊື່ພຶ້ນທີ່</string>
+    <string name="room_permissions_change_room_name">ປ່ຽນຊື່ຫ້ອງ</string>
+    <string name="room_permissions_change_history_visibility">ປ່ຽນການເບິ່ງເຫັນປະຫວັດ</string>
+    <string name="room_permissions_enable_space_encryption">ເປີດການເຂົ້າລະຫັດພື້ນທີ່</string>
+    <string name="room_permissions_enable_room_encryption">ເປີດການເຂົ້າລະຫັດຫ້ອງ</string>
+    <string name="room_permissions_change_main_address_for_the_space">ປ່ຽນທີ່ຢູ່ຫຼັກສຳລັບພື້ນທີ່</string>
+    <string name="room_permissions_change_main_address_for_the_room">ປ່ຽນທີ່ຢູ່ຫຼັກສຳລັບຫ້ອງ</string>
+    <string name="room_permissions_change_space_avatar">ປ່ຽນຮູບແທນຕົວຂອງພຶ້ນທີ່</string>
+    <string name="room_permissions_change_room_avatar">ປ່ຽນຮູບແທນຕົວຂອງຫ້ອງ</string>
+    <string name="room_permissions_modify_widgets">ແກ້ໄຂ widget</string>
+    <string name="room_permissions_notify_everyone">ແຈ້ງເຕືອນທຸກຄົນ</string>
+    <string name="room_permissions_remove_messages_sent_by_others">ລຶບຂໍ້ຄວາມທີ່ຄົນອື່ນສົ່ງມາ</string>
+    <string name="room_permissions_ban_users">ຫ້າມຜູ້ໃຊ້</string>
+    <string name="room_permissions_remove_users">ລຶບຜູ້ໃຊ້ອອກ</string>
+    <string name="room_permissions_change_settings">ປ່ຽນການຕັ້ງຄ່າ</string>
+    <string name="room_permissions_invite_users">ເຊີນຜູ້ໃຊ້</string>
+    <string name="room_permissions_send_messages">ສົ່ງຂໍ້ຄວາມ</string>
+    <string name="room_permissions_default_role">ບົດບາດເລີ່ມຕົ້ນ</string>
+    <string name="space_permissions_notice_read_only">ທ່ານບໍ່ໄດ້ຮັບອະນຸຍາດໃຫ້ປັບປຸງບົດບາດທີ່ຕ້ອງການປ່ຽນພາກສ່ວນຕ່າງໆຂອງພື້ນທີ່ນີ້</string>
+    <string name="room_permissions_notice_read_only">ທ່ານບໍ່ໄດ້ຮັບອະນຸຍາດໃຫ້ປັບປຸງບົດບາດທີ່ຕ້ອງການປ່ຽນພາກສ່ວນຕ່າງໆຂອງຫ້ອງ</string>
+    <string name="space_permissions_notice">ເລືອກບົດບາດທີ່ຕ້ອງການປ່ຽນພາກສ່ວນຕ່າງໆຂອງພື້ນທີ່ນີ້</string>
+    <string name="room_permissions_notice">ເລືອກບົດບາດທີ່ຕ້ອງການປ່ຽນພາກສ່ວນຕ່າງໆຂອງຫ້ອງ</string>
+    <string name="room_permissions_title">ການອະນຸຍາດ</string>
+    <string name="space_settings_permissions_subtitle">ເບິ່ງ ແລະອັບເດດບົດບາດທີ່ຕ້ອງການປ່ຽນພາກສ່ວນຕ່າງໆຂອງພື້ນທີ່.</string>
+    <string name="room_settings_permissions_subtitle">ເບິ່ງ ແລະ ອັບເດດບົດບາດທີ່ຕ້ອງການປ່ຽນພາກສ່ວນຕ່າງໆຂອງຫ້ອງ.</string>
+    <string name="space_settings_permissions_title">ການອະນຸຍາດພື້ນທີ່</string>
+    <string name="room_settings_permissions_title">ການອະນຸຍາດຫ້ອງ</string>
+    <string name="ssl_only_accept">ຍອມຮັບໃບຢັ້ງຢືນຖ້າຜູ້ເບິ່ງແຍງເຊີບເວີໄດ້ເຜີຍແຜ່ລາຍນິ້ວມືທີ່ກົງກັບຂ້າງເທິງ.</string>
+    <string name="ssl_cert_new_account_expl">ຖ້າຫາກຜູ້ເບິ່ງແຍງເຊີບເວີໄດ້ບອກວ່າເປັນເຊັ່ນນີ້, ໃຫ້ແນ່ໃຈວ່າລາຍນິ້ວມືຂ້າງລຸ່ມນີ້ກົງກັບລາຍນິ້ວມືທີ່ເຂົາເຈົ້າສະໜອງໃຫ້.</string>
+    <string name="ssl_cert_not_trust">ອັນນີ້ອາດໝາຍຄວາມວ່າມີຄົນຂັດຂວາງການຮັບສົ່ງຂອງທ່ານຢ່າງເຈດຕະນາ, ຫຼືວ່າໂທລະສັບຂອງທ່ານບໍ່ມີຄວາມໜ້າເຊື່ອຖືການຢັ້ງຢືນທີ່ສະໜອງໃຫ້ໂດຍເຊີບເວີທາງໄກ.</string>
+    <string name="ssl_could_not_verify">ບໍ່ສາມາດຢືນຢັນຕົວຕົນຂອງເຊີບເວີທາງໄກໄດ້.</string>
+    <string name="ssl_fingerprint_hash">ລາຍນິ້ວມື (%s):</string>
+    <string name="ssl_remain_offline">ບໍ່ສົນໃຈ</string>
+    <string name="ssl_logout_account">ອອກຈາກລະບົບ</string>
+    <string name="ssl_do_not_trust">ເຊື່ອຖືບໍ່ໄດ້</string>
+    <string name="ssl_trust">ເຊື່ອຖືໄດ້</string>
+    <plurals name="room_new_messages_notification">
+        <item quantity="other">%d ຂໍ້ຄວາມໃໝ່</item>
+    </plurals>
+    <string name="room_unsupported_e2e_algorithm_as_admin">ການຕັ້ງຄ່າເຂົ້າລະຫັດບໍ່ຖືກຕ້ອງ ດັ່ງນັ້ນທ່ານບໍ່ສາມາດສົ່ງຂໍ້ຄວາມໄດ້. ກົດເພື່ອເປີດການຕັ້ງຄ່າ.</string>
+    <string name="room_unsupported_e2e_algorithm">ຕັ້ງຄ່າການເຂົ້າລະຫັດບໍ່ຖືກຕ້ອງ ດັ່ງນັ້ນທ່ານບໍ່ສາມາດສົ່ງຂໍ້ຄວາມໄດ້. ກະລຸນາຕິດຕໍ່ຜູ້ເບິ່ງແຍງລະບົບເພື່ອກູ້ຄືນການເຂົ້າລະຫັດໃຫ້ເປັນສະຖານະທີ່ຖືກຕ້ອງ.</string>
+    <string name="room_do_not_have_permission_to_post">ທ່ານບໍ່ໄດ້ຮັບອະນຸຍາດໃຫ້ໂພສໃສ່ຫ້ອງນີ້.</string>
+    <string name="room_notification_more_than_two_users_are_typing">%1$s, %2$s ແລະ ອື່ນໆ</string>
+    <string name="room_notification_two_users_are_typing">%1$s ແລະ %2$s</string>
+    <string name="room_many_users_are_typing">%1$s &amp; %2$s ແລະ ຄົນອື່ນໆກຳລັງພິມ…</string>
+    <string name="room_two_users_are_typing">%1$s &amp; %2$s ກຳລັງພິມ…</string>
+    <string name="room_one_user_is_typing">%s ກຳລັງພິມ…</string>
+    <string name="space_participants_unban_prompt_msg">ການຍົກເລີກການຫ້າມຜູ້ໃຊ້ຈະອະນຸຍາດໃຫ້ພວກເຂົາເຂົ້າຮ່ວມພື້ນທີ່ອີກເທື່ອຫນຶ່ງ.</string>
+    <string name="room_participants_unban_prompt_msg">ການຍົກເລີກຜູ້ໃຊ້ຈະອະນຸຍາດໃຫ້ພວກເຂົາເຂົ້າຮ່ວມຫ້ອງອີກເທື່ອຫນຶ່ງ.</string>
+    <string name="space_participants_ban_prompt_msg">ການຫ້າມຜູ້ໃຊ້ຈະລຶບພວກເຂົາອອກຈາກພື້ນທີ່ນີ້ ແລະປ້ອງກັນບໍ່ໃຫ້ເຂົາເຈົ້າເຂົ້າຮ່ວມອີກຄັ້ງ.</string>
+    <string name="room_participants_ban_prompt_msg">ການຫ້າມຜູ້ໃຊ້ຈະລຶບເຂົາເຈົ້າອອກຈາກຫ້ອງນີ້ ແລະປ້ອງກັນບໍ່ໃຫ້ເຂົາເຈົ້າເຂົ້າຮ່ວມອີກຄັ້ງ.</string>
+    <string name="room_participants_unban_title">ຍົກເລີກການຫ້າມຜູ້ໃຊ້</string>
+    <string name="room_participants_ban_reason">ເຫດຜົນທີ່ຫ້າມ</string>
+    <string name="room_participants_ban_title">ຫ້າມຜູ້ໃຊ້</string>
+    <string name="space_participants_remove_prompt_msg">ຜູ້ໃຊ້ຈະຖືກລຶບອອກຈາກພື້ນທີ່ນີ້.
+\n
+\nເພື່ອປ້ອງກັນບໍ່ໃຫ້ພວກເຂົາເຂົ້າຮ່ວມອີກເທື່ອຫນຶ່ງ, ທ່ານຄວນຫ້າມພວກເຂົາແທນ.</string>
+    <string name="room_participants_remove_prompt_msg">ຜູ້ໃຊ້ຈະຖືກລຶບອອກຈາກຫ້ອງນີ້.
+\n
+\nເພື່ອປ້ອງກັນບໍ່ໃຫ້ພວກເຂົາເຂົ້າຮ່ວມອີກເທື່ອຫນຶ່ງ, ທ່ານຄວນຫ້າມພວກເຂົາແທນ.</string>
+    <string name="room_participants_remove_reason">ເຫດຜົນທີ່ຈະລຶບອອກ</string>
+    <string name="room_participants_remove_title">ເອົາຜູ້ໃຊ້ອອກ</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການຍົກເລີກການເຊີນຜູ້ໃຊ້ນີ້\?</string>
+    <string name="room_participants_action_cancel_invite_title">ຍົກເລີກການເຊີນ</string>
+    <string name="room_participants_action_unignore">ຍົກເລີກການບໍ່ສົນໃຈ</string>
+    <string name="room_participants_action_unignore_prompt_msg">ການບໍ່ສົນໃຈຜູ້ໃຊ້ນີ້ຈະສະແດງຂໍ້ຄວາມທັງໝົດຈາກເຂົາເຈົ້າອີກຄັ້ງ.
+\n
+\nກະລຸນາຮັບຊາບວ່າຄຳສັ່ງນີ້ຈະປິດເປີດແອັບຄືນໃໝ່ ແລະ ມັນອາດຈະໃຊ້ເວລາຄາວໜຶ່ງ.</string>
+    <string name="room_participants_action_unignore_title">ບໍ່ສົນໃຈຜູ້ໃຊ້</string>
+    <string name="room_participants_action_ignore">ບໍ່ສົນໃຈ</string>
+    <string name="room_participants_action_ignore_prompt_msg">ການບໍ່ສົນໃຈຜູ້ໃຊ້ນີ້ຈະລຶບຂໍ້ຄວາມຂອງເຂົາເຈົ້າອອກຈາກຫ້ອງທີ່ທ່ານແບ່ງປັນ.
+\n
+\nທ່ານສາມາດຍົກເລີກການກະທຳນີ້ໄດ້ທຸກເວລາໃນການຕັ້ງຄ່າທົ່ວໄປ.</string>
+    <string name="room_participants_action_ignore_title">ບໍ່ສົນໃຈຜູ້ໃຊ້</string>
+    <string name="room_participants_power_level_demote">ຫຼຸດລະດັບ</string>
+    <string name="room_participants_power_level_demote_warning_prompt">ທ່ານຈະບໍ່ສາມາດຍົກເລີກການປ່ຽນແປງນີ້ໄດ້ໃນຂະນະທີ່ທ່ານກໍາລັງ ລຸດລະດັັບຕົວທ່ານເອງ, ຖ້າທ່ານເປັນຜູ້ໃຊ້ສິດທິພິເສດສຸດທ້າຍຢູ່ໃນຫ້ອງ, ມັນຈະເປັນໄປບໍ່ໄດ້ທີ່ຈະຄືນສິດທິພິເສດ.</string>
+    <string name="room_participants_power_level_demote_warning_title">ຫຼຸດລະດັບຕົວເອງບໍ\?</string>
+    <string name="room_participants_power_level_prompt">ທ່ານຈະບໍ່ສາມາດຍົກເລີກການປ່ຽນແປງນີ້ໄດ້ເນື່ອງຈາກທ່ານກໍາລັງສົ່ງເສີມຜູ້ໃຊ້ໃຫ້ມີລະດັບພະລັງງານດຽວກັນກັບຕົວທ່ານເອງ.
+\nທ່ານແນ່ໃຈບໍ່\?</string>
+    <string name="room_participants_action_mention">ກ່າວເຖິງ</string>
+    <string name="room_participants_action_remove">ລຶບອອກຈາກການສົນທະນາ</string>
+    <string name="room_participants_action_unban">ຍົກເລີກການຫ້າມ</string>
+    <string name="room_participants_action_ban">ຫ້າມ</string>
+    <string name="room_participants_action_cancel_invite">ຍົກເລີກການເຊີນ</string>
+    <string name="room_participants_action_invite">ເຊີນ</string>
+    <string name="room_participants_header_direct_chats">ຂໍ້ຄວາມໂດຍກົງ</string>
+    <string name="room_participants_leave_private_warning">ຫ້ອງນີ້ບໍ່ແມ່ນສາທາລະນະ. ທ່ານຈະບໍ່ສາມາດເຂົ້າຮ່ວມຄືນໃໝ່ໄດ້ໂດຍບໍ່ມີການເຊີນ.</string>
+    <string name="room_participants_leave_prompt_msg">ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການອອກຈາກຫ້ອງ\?</string>
+    <string name="room_participants_leave_prompt_title">ອອກຈາກຫ້ອງ</string>
+    <plurals name="room_title_members">
+        <item quantity="other">ສະມາຊິກ %d</item>
+    </plurals>
+    <string name="room_jump_to_first_unread">ໄປຫາລາຍການທີ່ຍັງບໍ່ໄດ້ອ່ານ</string>
+    <string name="list_members">ສະມາຊິກ</string>
+    <string name="_continue">ສືບຕໍ່</string>
+    <string name="no">ບໍ່</string>
+    <string name="yes">ແມ່ນແລ້ວ</string>
+    <string name="permissions_denied_add_contact">ອະນຸຍາດໃຫ້ເຂົ້າເຖິງລາຍຊື່ຜູ້ຕິດຕໍ່ຂອງທ່ານ.</string>
+    <string name="permissions_denied_qr_code">ເພື່ອສະແກນລະຫັດ QR, ທ່ານຈໍາເປັນຕ້ອງອະນຸຍາດໃຫ້ເຂົ້າເຖິງກ້ອງຖ່າຍຮູບ.</string>
+    <string name="permissions_rationale_msg_camera_and_audio">${app_name} ຕ້ອງການການອະນຸຍາດເພື່ອເຂົ້າເຖິງກ້ອງຖ່າຍຮູບ ແລະໄມໂຄຣໂຟນຂອງທ່ານເພື່ອໂທວິດີໂອ.
+\n
+\nກະລຸນາອະນຸຍາດໃຫ້ເຂົ້າເຖິງໃນpop-ups ຖັດໄປເພື່ອໃຫ້ສາມາດໂທອອກໄດ້.</string>
+    <string name="permissions_rationale_msg_record_audio">${app_name} ຕ້ອງການການອະນຸຍາດເພື່ອເຂົ້າເຖິງໄມໂຄຣໂຟນຂອງທ່ານເພື່ອປະຕິບັດການໂທສຽງ.</string>
+    <string name="permissions_rationale_popup_title">ຂໍ້ມູນ</string>
+    <string name="call_remove_jitsi_widget_progress">ກຳລັງວາງສາຍ…</string>
+    <string name="call_error_user_not_responding">ທາງໄກບໍ່ສາມາດຮັບໄດ້.</string>
+    <string name="call_ended_invite_timeout_title">ບໍ່ມີຄໍາຕອບ</string>
+    <string name="call_ended_user_busy_description">ຜູ້ໃຊ້ທີ່ທ່ານໂທຫາບໍ່ຫວ່າງ.</string>
+    <string name="call_ended_user_busy_title">ຜູ້ໃຊ້ບໍ່ຫວ່າງ</string>
+    <string name="call_held_by_you">ທ່ານຖືສາຍການໂທ</string>
+    <string name="call_held_by_user">%s ຖືສາຍ</string>
+    <string name="call_hold_action">ຖື</string>
+    <string name="call_resume_action">ປະຫວັດຫຍໍ້</string>
+    <string name="audio_call_with_participant">ໂທສຽງດ້ວຍ %s</string>
+    <string name="video_call_with_participant">ໂທວິດີໂອດ້ວຍ %s</string>
+    <string name="video_call_in_progress">ກຳລັງດຳເນີນການໂທດ້ວຍວິດີໂອ…</string>
+    <string name="call_in_progress">ກຳລັງດຳເນີນການໂທ…</string>
+    <string name="incoming_voice_call">ສາຍໂທເຂົ້າ</string>
+    <string name="incoming_video_call">ສາຍເຂົ້າວິດີໂອ</string>
+    <plurals name="missed_video_call">
+        <item quantity="other">%d ບໍ່ໄດ້ຮັບສາຍວິດີໂອ</item>
+    </plurals>
+    <plurals name="missed_audio_call">
+        <item quantity="other">%d ສາຍບໍ່ໄດ້ຮັບ</item>
+    </plurals>
+    <string name="call_ended">ສິ້ນສຸດການໂທ</string>
+    <string name="call_ringing">ກຳລັງໂທເຂົ້ົ້າ…</string>
+    <string name="call_connecting">ກຳລັງເຊື່ອມຕໍ່ການໂທ…</string>
+    <string name="call">ໂທ</string>
+    <string name="settings_call_ringtone_dialog_title">ເລືອກສຽງເອີ້ນເຂົ້າສໍາລັບການໂທ:</string>
+    <string name="settings_call_ringtone_title">ສຽງເອີ້ນເຂົ້າ</string>
+    <string name="settings_call_ringtone_use_app_ringtone">ໃຊ້ສຽງເອີ້ນເຂົ້າ ${app_name} ເລີ່ມຕົ້ນສຳລັບສາຍໂທເຂົ້າ</string>
+    <string name="settings_call_show_confirmation_dialog_summary">ຂໍການຢືນຢັນກ່ອນເລີ່ມການໂທ</string>
+    <string name="settings_call_show_confirmation_dialog_title">ປ້ອງກັນການໂທຫາໂດຍບັງເອີນ</string>
+    <string name="settings_call_category">ໂທ</string>
+    <string name="compression_opt_list_small">ຂະຫນາດນ້ອຍ</string>
+    <string name="compression_opt_list_medium">ຂະຫນາດກາງ</string>
+    <string name="compression_opt_list_large">ຂະຫນາດໃຫຍ່</string>
+    <string name="compression_opt_list_original">ຕົ້ນສະບັບ</string>
+    <plurals name="membership_changes">
+        <item quantity="other">%d ການປ່ຽນແປງສະມາຊິກ</item>
+    </plurals>
+    <string name="e2e_re_request_encryption_key_dialog_content">ກະລຸນາເປີດ ${app_name} ໃນອຸປະກອນອື່ນທີ່ສາມາດຖອດລະຫັດຂໍ້ຄວາມໄດ້ເພື່ອໃຫ້ສາມາດສົ່ງລະຫັດໄປຫາລະບົບນີ້.</string>
+    <string name="e2e_re_request_encryption_key">ຮ້ອງຂໍລະຫັດການເຂົ້າລະຫັດຄືນໃໝ່ຈາກລະບົບອື່ນຂອງທ່ານ.</string>
+    <string name="login_error_limit_exceeded">ມີການຮ້ອງຂໍຫຼາຍເກີນໄປ</string>
+    <string name="login_error_not_json">ບໍ່ມີ JSON ທີ່ຖືກຕ້ອງ</string>
+    <string name="login_error_bad_json">JSON ບໍ່ຖືກຕ້ອງ</string>
+    <string name="error_unauthorized">ບໍ່ໄດ້ຮັບອະນຸຍາດ, ຂາດຂໍ້ມູນການພິສູດຢືນຢັນທີ່ຖືກຕ້ອງ</string>
+    <string name="login_error_ssl_other">SSL ຜິດພາດ.</string>
+    <string name="login_error_ssl_peer_unverified">SSL ຜິດພາດ: ຂ້ມູນການເບິ່ງເຫັນຍັງບໍ່ໄດ້ຮັບການກວດສອບ.</string>
+    <string name="login_error_homeserver_from_url_not_found_enter_manual">ເລືອກ homeserver</string>
+    <string name="login_error_homeserver_from_url_not_found">ບໍ່ສາມາດເຂົ້າຫາ homeserver ທີ່ URL %s ໄດ້. ກະລຸນາກວດເບິ່ງລິ້ງຂອງທ່ານ ຫຼືເລືອກ homeserver ດ້ວຍຕົນເອງ.</string>
+    <string name="login_error_homeserver_not_found">ບໍ່ສາມາດເຂົ້າຫາ homeserver ຢູ່ URL ນີ້, ກະລຸນາກວດເບິ່ງ</string>
+    <string name="login_error_no_homeserver_found">ນີ້ບໍ່ແມ່ນທີ່ຢູ່ເຊີບເວີ Matrix ທີ່ຖືກຕ້ອງ</string>
+    <string name="login_error_invalid_home_server">ກະລຸນາໃສ່ URL ທີ່ຖືກຕ້ອງ</string>
+    <string name="auth_accept_policies">ກະລຸນາກວດເບິ່ງ ແລະຍອມຮັບນະໂຍບາຍຂອງ homeserver ນີ້:</string>
+    <string name="auth_reset_password_error_unauthorized">ການກວດສອບທີ່ຢູ່ອີເມວບໍ່ສຳເລັດ: ໃຫ້ແນ່ໃຈວ່າທ່ານໄດ້ກົດໃສ່ການເຊື່ອມຕໍ່ໃນອີເມວ</string>
+    <string name="auth_reset_password_missing_email">ຕ້ອງໃສ່ອິເມວທີ່ເຊື່ອມຕໍ່ກັບບັນຊີຂອງທ່ານ.</string>
+    <string name="auth_recaptcha_message">homeserver ນີ້ຕ້ອງການໃຫ້ແນ່ໃຈວ່າທ່ານບໍ່ແມ່ນຫຸ່ນຍົນ</string>
+    <string name="auth_forgot_password">ລືມລະຫັດຜ່ານ\?</string>
+    <string name="auth_msisdn_already_defined">ເບີໂທລະສັບນີ້ຖືກກໍານົດໄວ້ແລ້ວ.</string>
+    <string name="auth_email_already_defined">ທີ່ຢູ່ອີເມວນີ້ຖືກກຳນົດແລ້ວ.</string>
+    <string name="auth_invalid_email">ອັນນີ້ເບິ່ງຄືວ່າບໍ່ແມ່ນທີ່ຢູ່ອີເມວທີ່ຖືກຕ້ອງ</string>
+    <string name="auth_invalid_login_param">ຊື່ຜູ້ໃຊ້ ແລະ/ຫຼືລະຫັດຜ່ານບໍ່ຖືກຕ້ອງ</string>
+    <string name="auth_submit">ສົ່ງ</string>
+    <string name="auth_login_sso">ເຂົ້າສູ່ລະບົບດ້ວຍການເຂົ້າສູ່ລະບົບຄັ້ງດຽວ</string>
+    <string name="auth_login">ເຂົ້າສູ່ລະບົບ</string>
+    <string name="error_no_external_application_found">ຂໍອະໄພ, ບໍ່ພົບແອັບພລິເຄຊັນພາຍນອກເພື່ອເຮັດສຳເລັດການດຳເນິນການນີ້.</string>
+    <string name="no_sticker_application_dialog_content">ໃນປັດຈຸບັນທ່ານບໍ່ໄດ້ເປີດໃຊ້ສະຕິກເກີແພັກເກັດໃດໆ.
+\n
+\nເພີ່ມບາງອັນດຽວນີ້ບໍ\?</string>
+    <string name="use_as_default_and_do_not_ask_again">ໃຊ້ເປັນຄ່າເລີ່ມຕົ້ນ ແລະ ຢ່າຖາມອີກ</string>
+    <string name="option_always_ask">ຖາມທຸກຄັ້ງ</string>
+    <string name="option_take_video">ເອົາວິດີໂອ</string>
+    <string name="option_take_photo">ຖ່າຍຮູບ</string>
+    <string name="option_take_photo_video">ຖ່າຍຮູບ ຫຼືວິດີໂອ</string>
+    <string name="option_send_sticker">ສົ່ງສະຕິກເກີ</string>
+    <string name="option_send_files">ສົ່ງໄຟລ໌</string>
+    <string name="call_format_turn_hd_on">ເປີດ HD</string>
+    <string name="call_format_turn_hd_off">ປິດ HD</string>
+    <string name="call_camera_back">ດ້ານຫລັງ</string>
+    <string name="call_camera_front">ດ້ານໜ້າ</string>
+    <string name="call_switch_camera">ສະຫຼັບກ້ອງຖ່າຍຮູບ</string>
+    <string name="sound_device_wireless_headset">ຊຸດຫູຟັງໄຮ້ສາຍ</string>
+    <string name="sound_device_headset">ຊຸດຫູຟັງ</string>
+    <string name="sound_device_speaker">ລໍາໂພງ</string>
+    <string name="sound_device_phone">ໂທລະສັບ</string>
+    <string name="call_select_sound_device">ເລືອກອຸປະກອນສຽງ</string>
+    <string name="call_failed_no_connection_description">ການສ້າງການເຊື່ອມຕໍ່ແບບສົດໆບໍ່ສຳເລັດ.
+\nກະລຸນາຮ້ອງຂໍໃຫ້ຜູ້ເບິ່ງແຍງ homeserver ຂອງທ່ານເພື່ອກໍານົດຄ່າເຊີບເວີ TURN ເພື່ອໃຫ້ການໂທເຮັດວຽກໄດ້ຢ່າງຫມັ້ນຄົງ.</string>
+    <string name="call_failed_no_connection">${app_name} ໂທລົ້ມເຫລວ</string>
+    <string name="start_video_call_prompt_msg">ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການເລີ່ມການໂທດ້ວຍວິດີໂອ\?</string>
+    <string name="start_voice_call_prompt_msg">ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການເລີ່ມການໂທສຽງ\?</string>
+    <string name="option_send_voice">ສົ່ງສຽງ</string>
+    <string name="start_video_call">ລີ່ມການໂທວິດີໂອ</string>
+    <string name="start_voice_call">ເລີ່ມການໂທດ້ວຍສຽງ</string>
+    <string name="search">ຊອກຫາ</string>
+    <string name="hs_client_url">API URL ຂອງສະຖານີ</string>
+    <string name="hs_url">Homeserver URL</string>
+    <string name="logout">ອອກຈາກລະບົບ</string>
+    <string name="username">ຊື່ຜູ້ໃຊ້</string>
+    <string name="join_room">ເຂົ້າຮ່ວມຫ້ອງ</string>
+    <string name="send_bug_report_progress">ຄວາມຄືບໜ້າ (%s%%)</string>
+    <string name="send_bug_report_failed">ບໍ່ສາມາດສົ່ງລາຍງານຂໍ້ຜິດພາດໄດ້ (%s)</string>
+    <string name="send_bug_report_sent">ໄດ້ສົ່ງລາຍງານຂໍ້ຜິດພາດໄປແລ້ວ</string>
+    <string name="send_bug_report_rage_shake">ສັ່ນເພື່ອລາຍງານຂໍ້ຜິດພາດ</string>
+    <string name="send_bug_report_app_crashed">ແອັບພລິເຄຊັນໄດ້ຂັດຂ້ອງໃນຄັ້ງທີ່ຜ່ານມາ. ທ່ານຕ້ອງການເປີດໜ້າຈໍລາຍງານການຂັດຂ້ອງບໍ\?</string>
+    <string name="send_bug_report_alert_message">ເບິ່ງຄືວ່າທ່ານກຳລັງສັ່ນໂທລະສັບດ້ວຍຄວາມຫງຸດຫງິດ. ທ່ານຕ້ອງການເປີດໜ້າຈໍລາຍງານຂໍ້ຜິດພາດບໍ\?</string>
+    <string name="send_bug_report_logs_description">ເພື່ອວິນິດໄສບັນຫາ, ບັນທຶກຈາກລູກຄ້ານີ້ຈະຖືກສົ່ງພ້ອມກັບບົດລາຍງານຂໍ້ຜິດພາດນີ້. ລາຍງານຂໍ້ຜິດພາດນີ້, ລວມທັງບັນທຶກ ແລະພາບໜ້າຈໍ, ຈະບໍ່ປາກົດໃຫ້ສາທາລະນະເຫັນໄດ້. ຖ້າທ່ານຕ້ອງການພຽງແຕ່ສົ່ງຂໍ້ຄວາມຂ້າງເທິງ, ກະລຸນາ ຢາກົດເລືອກ:</string>
+    <string name="send_bug_report_placeholder">ອະທິບາຍບັນຫາຂອງທ່ານຢູ່ບ່ອນນີ້</string>
+    <string name="send_bug_report_description_in_english">ຖ້າເປັນໄປໄດ້, ກະລຸນາຂຽນຄໍາອະທິບາຍເປັນພາສາອັງກິດ.</string>
+    <string name="send_bug_report_description">ກະລຸນາອະທິບາຍຂໍ້ບົກພ່ອງ. ທ່ານເຮັດຫຍັງລົງໄປ\?ທ່ານຄາດວ່າຈະມີຫຍັງເກີດຂຶ້ນ\? ທີ່ຈິງແລ້ວເກີດຫຍັງຂຶ້ນ\?</string>
+    <string name="send_bug_report">ລາຍງານຂໍ້ຜິດພາດ</string>
+    <string name="send_bug_report_include_screenshot">ສົ່ງຮູບໜ້າຈໍ</string>
+    <string name="send_bug_report_include_key_share_history">ສົ່ງປະຫວັດການຮ້ອງຂໍການແບ່ງປັນທີ່ສໍາຄັນ</string>
+    <string name="send_bug_report_include_crash_logs">ສົ່ງບັນທຶກການຂັດຂ້ອງ</string>
+    <string name="send_bug_report_include_logs">ສົ່ງບັນທຶກ</string>
+    <string name="spaces_header">ພື້ນທີ່</string>
+    <string name="groups_header">ຊຸມຊົນ</string>
+    <string name="settings_room_directory_show_all_rooms_summary">ສະແດງໃຫ້ເຫັນຫ້ອງທັງຫມົດໃນລະບົບຫ້ອງ, ລວມທັງຫ້ອງທີ່ມີເນື້ອຫາຊັດເຈນ.</string>
+    <string name="settings_room_directory_show_all_rooms">ສະແດງຫ້ອງທີ່ມີເນື້ອຫາບໍ່ຈະແຈ້ງ</string>
+    <string name="rooms_header">ຫ້ອງ</string>
+    <string name="no_more_results">ບໍ່ມີຜົນໄດ້ຮັບອີກຕໍ່ໄປ</string>
+    <string name="no_result_placeholder">ບໍ່ມີຜົນໄດ້ຮັບ</string>
+    <string name="matrix_only_filter">ຕິດຕໍ່ Matrix ເທົ່ານັ້ນ</string>
+    <string name="direct_chats_header">ການສົນທະນາ</string>
+    <string name="suggested_header">ຫ້ອງແນະນຳ</string>
+    <string name="system_alerts_header">ການແຈ້ງເຕືອນລະບົບ</string>
+    <string name="low_priority_header">ບູລິມະສິດຕໍ່າ</string>
+    <string name="invitations_header">ເຊີນ</string>
+    <string name="home_filter_placeholder_home">ກັ່ນຕອງຊື່ຫ້ອງ</string>
+    <string name="bottom_action_rooms">ຫ້ອງ</string>
+    <string name="bottom_action_people">ຄົນ</string>
+    <string name="bottom_action_favourites">ລາຍການທີ່ມັກ</string>
+    <string name="bottom_action_notification">ການແຈ້ງເຕືອນ</string>
+    <string name="dialog_edit_hint">ຄ່າໃໝ່</string>
+    <string name="dialog_title_success">ຄວາມສໍາເລັດ</string>
+    <string name="dialog_title_error">ຜິດພາດ</string>
+    <string name="dialog_title_confirmation">ການຢືນຢັນ</string>
+    <string name="action_thread_copy_link_to_thread">ສຳເນົາລິ້ງໃສ່ກະທູ້</string>
+    <string name="action_thread_view_in_room">ເບິ່ງຢູ່ໃນຫ້ອງ</string>
+    <string name="copied_to_clipboard">ສຳເນົາໃສ່ຄລິບບອດແລ້ວ</string>
+    <string name="action_learn_more">ສຶກສາເພີ່ມເຕີມ</string>
+    <string name="action_reset">ຕັ້ງຄ່າຄືນໃໝ່</string>
+    <string name="action_dismiss">ປິດ</string>
+    <string name="action_play">ຫຼິ້ນ</string>
+    <string name="action_disconnect">ຕັດການເຊື່ອມຕໍ່</string>
+    <string name="action_revoke">ຖອນຄືນ</string>
+    <string name="action_rename">ປ່ຽນຊື່</string>
+    <string name="action_delete">ລຶບ</string>
+    <string name="action_share">ແບ່ງປັນ</string>
+    <string name="action_download">ດາວໂຫຼດ</string>
+    <string name="action_quote">ວົງຢືມ</string>
+    <string name="action_send">ສົ່ງ</string>
+    <string name="action_leave">ອອກໄປ</string>
+    <string name="action_save">ບັນທຶກ</string>
+    <string name="action_cancel">ຍົກເລີກ</string>
+    <string name="action_invite">ເຊີນ</string>
+    <string name="action_decline">ຫຼຸດລົງ</string>
+    <string name="action_ignore">ບໍ່ສົນໃຈ</string>
+    <string name="action_skip">ຂ້າມ</string>
+    <string name="action_accept">ຍອມຮັບ</string>
+    <string name="action_reject">ປະຕິເສດ</string>
+    <string name="action_join">ເຂົ້າຮ່ວມ</string>
+    <string name="action_remove">ລຶບອອກ</string>
+    <string name="action_change">ປ່ຽນແປງ</string>
+    <string name="action_agree">ເຫັນດີ</string>
+    <string name="action_try_it_out">ລອງໃຊ້ເບິ່ງ</string>
+    <string name="action_not_now">ບໍ່ແມ່ນຕອນນີ້</string>
+    <string name="action_disable">ປິດໃຊ້ງານ</string>
+    <string name="action_enable">ເປີດໃຊ້</string>
+    <string name="action_unpublish">ຍົກເລີກການເຜີຍແຜ່</string>
+    <string name="action_switch">ສະຫຼັບ</string>
+    <string name="action_add">ເພີ່ມ</string>
+    <string name="action_copy">ສຳເນົາ</string>
+    <string name="action_close">ປິດ</string>
+    <string name="action_open">ເປີດ</string>
+    <string name="action_mark_room_read">ໝາຍວ່າອ່ານແລ້ວ</string>
+    <string name="action_quick_reply">ຕອບກັບດ່ວນ</string>
+    <string name="action_mark_all_as_read">ໝາຍທັງໝົດວ່າອ່ານແລ້ວ</string>
+    <string name="action_view_threads">ເບິ່ງກະທູ້</string>
+    <string name="action_video_call">ໂທວິດີໂອ</string>
+    <string name="action_voice_call">ໂທສຽງ</string>
+    <string name="action_sign_out_confirmation_simple">ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການອອກຈາກລະບົບ\?</string>
+    <string name="action_sign_out">ອກຈາກລະບົບ</string>
+    <string name="call_notification_hangup">ວາງສາຍ</string>
+    <string name="call_notification_reject">ຫຼຸດລົງ</string>
+    <string name="call_notification_answer">ຍອມຮັບ</string>
+    <string name="done">ສຳເລັດແລ້ວ</string>
+    <string name="or">ຫຼື</string>
+    <string name="failed_to_remove_widget">ລຶບວິດເຈັດບໍ່ສຳເລັດ</string>
+    <string name="failed_to_add_widget">ເພີ່ມວິດເຈັດບໍ່ສຳເລັດ</string>
+    <string name="cannot_call_yourself_with_invite">ທ່ານບໍ່ສາມາດໂທຫາຕົວທ່ານເອງໄດ້, ລໍຖ້າໃຫ້ຜູ້ເຂົ້າຮ່ວມທີ່ຈະຮັບເອົາການເຊີນ</string>
+    <string name="cannot_call_yourself">ທ່ານບໍ່ສາມາດໂທຫາຕົວທ່ານເອງໄດ້</string>
+    <string name="audio_video_meeting_description">ກອງປະຊຸມໃຊ້ນະໂຍບາຍຄວາມປອດໄພ ແລະອະນຸຍາດ Jitsi. ຄົນທັງໝົດຢູ່ໃນຫ້ອງໃນປັດຈຸບັນຈະເຫັນຄຳເຊີນໃຫ້ເຂົ້າຮ່ວມ ໃນຂະນະທີ່ການປະຊຸມຂອງທ່ານກຳລັງເກີດຂຶ້ນ.</string>
+    <string name="audio_meeting">ເລີ່ມການປະຊຸມສຽງ</string>
+    <string name="video_meeting">ເລີ່ມການປະຊຸມວິດີໂອ</string>
+    <string name="no_permissions_to_start_webrtc_call_in_direct_room">ທ່ານບໍ່ໄດ້ຮັບອະນຸຍາດໃຫ້ເລີ່ມການໂທ</string>
+    <string name="no_permissions_to_start_webrtc_call">ທ່ານບໍ່ໄດ້ຮັບອະນຸຍາດໃຫ້ໂທຢູ່ໃນຫ້ອງນີ້</string>
+    <string name="no_permissions_to_start_conf_call_in_direct_room">ທ່ານບໍ່ໄດ້ຮັບອະນຸຍາດໃຫ້ເລີ່ມການປະຊຸມທາງໂທລະສັບ</string>
+    <string name="no_permissions_to_start_conf_call">ທ່ານບໍ່ມີສິດໃນການເລີ່ມການໂທປະຊຸມຢູ່ໃນຫ້ອງນີ້</string>
+    <string name="missing_permissions_title">ຂາດການອະນຸຍາດ</string>
+    <string name="denied_permission_voice_message">ເພື່ອສົ່ງຂໍ້ຄວາມສຽງ, ກະລຸນາອະນຸຍາດໄມໂຄຣໂຟນ.</string>
+    <string name="denied_permission_camera">ເພື່ອດໍາເນີນການນີ້, ກະລຸນາອະນຸຍາດກ້ອງຖ່າຍຮູບຈາກການຕັ້ງຄ່າລະບົບ.</string>
+    <string name="denied_permission_generic">ຂາດການອະນຸຍາດບາງຢ່າງເພື່ອດໍາເນີນການນີ້, ກະລຸນາໃຫ້ການອະນຸຍາດຈາກການຕັ້ງຄ່າລະບົບ.</string>
+    <string name="spaces">ພື້ນທີ່</string>
+    <string name="start_chatting">ເລີ່ມການສົນທະນາ</string>
+    <string name="report_content">ລາຍງານເນື້ອຫາ</string>
+    <string name="none">ບໍ່ມີ</string>
+    <string name="view_decrypted_source">ເບິ່ງແຫຼ່ງທີ່ຖອດລະຫັດ</string>
+    <string name="view_source">ເບິ່ງແຫຼ່ງ</string>
+    <string name="permalink">ລິ້ງຖາວອນ</string>
+    <string name="later">ຕໍ່ມາ</string>
+    <string name="ok">ຕົກລົງ</string>
+    <string name="loading">ກຳລັງໂຫລດ…</string>
+    <string name="sign_out_bottom_sheet_will_lose_secure_messages">ທ່ານຈະສູນເສຍການເຂົ້າເຖິງຂໍ້ຄວາມທີ່ເຂົ້າລະຫັດໄວ້ຂອງທ່ານເວັ້ນເສຍແຕ່ທ່ານຈະສໍາຮອງລະຫັດຂອງທ່ານກ່ອນທີ່ຈະອອກຈາກລະບົບ.</string>
+    <string name="backup">ສຳຮອງ</string>
+    <string name="are_you_sure">ທ່ານແນ່ໃຈບໍ່\?</string>
+    <string name="sign_out_bottom_sheet_backing_up_keys">ກຳລັງສຳຮອງຂໍ້ມູນ…</string>
+    <string name="sign_out_bottom_sheet_dont_want_secure_messages">ຂ້ອຍບໍ່ຕ້ອງການຂໍ້ຄວາມທີ່ຖືກເຂົ້າລະຫັດຂອງຂ້ອຍ</string>
+    <string name="sign_out_bottom_sheet_warning_backup_not_active">ສຳຮອງຂໍ້ມູນກະເເຈຄວາມປອດໄພ ຄວນມີການເຄື່ອນໄຫວຢູ່ໃນທຸກລະບົບຂອງທ່ານເພື່ອຫຼີກເວັ້ນການສູນເສຍການເຂົ້າເຖິງຂໍ້ຄວາມທີ່ຖືກເຂົ້າລະຫັດຂອງທ່ານ.</string>
+    <string name="sign_out_bottom_sheet_warning_backing_up">ການສຳຮອງຂໍ້ມູນກະແຈກຳລັງດຳເນີນຢູ່. ຖ້າທ່ານອອກຈາກລະບົບດຽວນີ້, ທ່ານຈະສູນເສຍການເຂົ້າເຖິງຂໍ້ຄວາມທີ່ຖືກເຂົ້າລະຫັດຂອງທ່ານ.</string>
+    <string name="sign_out_bottom_sheet_warning_no_backup">ທ່ານຈະສູນເສຍຂໍ້ຄວາມທີ່ເຂົ້າລະຫັດໄວ້ຫາກທ່ານອອກຈາກລະບົບດຽວນີ້</string>
+    <string name="title_activity_keys_backup_restore">ໃຊ້ ກະເເຈສຳນອງ</string>
+    <string name="title_activity_keys_backup_setup">ສໍາຮອງກະແຈ</string>
+    <string name="title_activity_choose_sticker">ສົ່ງສະຕິກເກີ</string>
+    <string name="title_activity_bug_report">ລາຍງານຂໍ້ຜິດພາດ</string>
+    <string name="title_activity_settings">ການຕັ້ງຄ່າ</string>
+    <string name="notification_silent_notifications">ການແຈ້ງເຕືອນສຽງງຽບ</string>
+    <string name="notification_noisy_notifications">ການແຈ້ງເຕືອນສຽງລົບກວນ</string>
+    <string name="notification_listening_for_notifications">ກຳລັງຟັງການແຈ້ງເຕືອນ</string>
+    <string name="notification_listening_for_events">ຟັງເຫດການ</string>
+    <string name="black_theme">ຮູບແບບຫົວຂໍ້ສີດໍາ</string>
+    <string name="dark_theme">ຮູບແບບສີສັນມືດ</string>
+    <string name="light_theme">ຮູບແບບສີສັນແຈ້ງ</string>
+    <string name="system_theme">ຄ່າເລີ່ມຕົ້ນຂອງລະບົບ</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">ທ່ານໄດ້ເປີດການເຂົ້າລະຫັດແບບຕົ້ນທາງຮອດປາຍທາງ (ລະບົບທີ່ບໍ່ສາມາດຮັບຮູ້ໄດ້ %1$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s ເປີດໃຊ້ການເຂົ້າລະຫັດແບບຕົ້ນທາງຮອດປາຍທາງ (ລະບົບທີ່ບໍ່ສາມາດຮັບຮູ້ໄດ້ %2$s).</string>
+    <string name="notice_end_to_end_ok_by_you">ທ່ານໄດ້ເປີດການເຂົ້າລະຫັດແບບຕົ້ນທາງຮອດປາຍທາງ.</string>
+    <string name="notice_end_to_end_ok">%1$s ເປີດການເຂົ້າລະຫັດແບບຕົ້ນທາງຮອດປາຍທາງ.</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">ທ່ານໄດ້ປ້ອງກັນບໍ່ໃຫ້ແຂກເຂົ້າຮ່ວມຫ້ອງ.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s ໄດ້ປ້ອງກັນບໍ່ໃຫ້ແຂກເຂົ້າຮ່ວມຫ້ອງ.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">ທ່ານໄດ້ປ້ອງກັນບໍ່ໃຫ້ແຂກເຂົ້າຮ່ວມຫ້ອງ.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s ໄດ້ປ້ອງກັນບໍ່ໃຫ້ແຂກເຂົ້າຮ່ວມຫ້ອງ.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">ທ່ານໄດ້ອະນຸຍາດໃຫ້ແຂກເຂົ້າຮ່ວມທີ່ນີ້.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s ໄດ້ອະນຸຍາດໃຫ້ແຂກເຂົ້າຮ່ວມທີ່ນີ້.</string>
+    <string name="notice_room_guest_access_can_join_by_you">ທ່ານໄດ້ອະນຸຍາດໃຫ້ແຂກເຂົ້າຮ່ວມຫ້ອງ.</string>
+    <string name="notice_room_guest_access_can_join">%1$s ໄດ້ອະນຸຍາດໃຫ້ແຂກເຂົ້າຮ່ວມຫ້ອງ.</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">ທ່ານໄດ້ປ່ຽນທີ່ຢູ່ຂອງຫ້ອງນີ້.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s ໄດ້ປ່ຽນທີ່ຢູ່ຂອງຫ້ອງນີ້.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">ທ່ານໄດ້ປ່ຽນທີ່ຢູ່ຫຼັກ ແລະທາງເລືອກສຳລັບຫ້ອງນີ້.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s ໄດ້ປ່ຽນທີ່ຢູ່ຕົ້ນຕໍ ແລະທາງເລືອກສຳລັບຫ້ອງນີ້.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">ທ່ານໄດ້ປ່ຽນທີ່ຢູ່ທາງເລືອກສຳລັບຫ້ອງນີ້.</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s ໄດ້ປ່ຽນທີ່ຢູ່ທາງເລືອກສຳລັບຫ້ອງນີ້.</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="other">ທ່ານໄດ້ລຶບທີ່ຢູ່ສຳຮອງ %1$s ສໍາລັບຫ້ອງນີ້ອອກ.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="other">%1$s ໄດ້ລຶບທີ່ຢູ່ສຳຮອງ %2$s ອອກຈາກຫ້ອງນີ້.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="other">ທ່ານໄດ້ເພີ່ມທີ່ຢູ່ສຳຮອງ %1$s ສໍາລັບຫ້ອງນີ້.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="other">%1$s ໄດ້ເພີ່ມທີ່ຢູ່ສຳຮອງ %2$s ສໍາລັບຫ້ອງນີ້.</item>
+    </plurals>
+    <string name="notice_room_canonical_alias_unset_by_you">ທ່ານໄດ້ລຶບທີ່ຢູ່ຫຼັກຂອງຫ້ອງນີ້ອອກ.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s ລຶບທີ່ຢູ່ຫຼັກຂອງຫ້ອງນີ້ອອກ.</string>
+    <string name="notice_room_canonical_alias_set_by_you">ທ່ານຕັ້ງຄ່າທີ່ຢູ່ຫຼັກສຳລັບຫ້ອງນີ້ເປັນ %1$s.</string>
+    <string name="notice_room_canonical_alias_set">%1$s ຕັ້ງຄ່າທີ່ຢູ່ຫຼັກສຳລັບຫ້ອງນີ້ເປັນ %2$s.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">ທ່ານໄດ້ເພີ່ມ %1$s ແລະເອົາອອກ %2$sທີ່ຢູ່ຂອງຫ້ອງນີ້.</string>
+    <string name="notice_room_aliases_added_and_removed">%1$s ເພີ່ມ %2$s ແລະ ເອົາອອກ %3$s ເປັນທີ່ຢູ່ຂອງຫ້ອງນີ້.</string>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="other">ທ່ານໄດ້ລຶບອອກ %1$s ທີ່ຢູ່ສຳລັບຫ້ອງນີ້.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="other">%1$s ລຶບອອກ %2$s ເປັນທີ່ຢູ່ຂອງຫ້ອງນີ້.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="other">ທ່ານໄດ້ເພີ່ມ %1$s ເປັນທີ່ຢູ່ສຳລັບຫ້ອງນີ້.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="other">%1$s ເພີ່ມ %2$s ເປັນທີ່ຢູ່ສຳລັບຫ້ອງນີ້.</item>
+    </plurals>
+    <string name="notice_room_withdraw_with_reason_by_you">ທ່ານໄດ້ຖອນຄຳເຊີນຂອງ %1$s ແລ້ວ. ເຫດຜົນ: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s ຖອນຄຳເຊີນຂອງ %2$s. ເຫດຜົນ: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">ທ່ານຍອມຮັບຄຳເຊີນສຳລັບ %1$s. ເຫດຜົນ: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s ຍອມຮັບຄຳເຊີນສຳລັບ %2$s. ເຫດຜົນ: %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">ທ່ານໄດ້ຖືກຫ້າມ %1$s. ເຫດຜົນ: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s ຖືກຫ້າມ %2$s. ເຫດຜົນ: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">ທ່ານໄດ້ຍົກເລີກການຫ້າມ %1$s. ເຫດຜົນ: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s ຍົກເລີກການຫ້າມ %2$s. ເຫດຜົນ: %3$s</string>
+    <string name="notice_room_remove_with_reason_by_you">ທ່ານໄດ້ລຶບ %1$s ອອກແລ້ວ. ເຫດຜົນ: %2$s</string>
+    <string name="notice_room_remove_with_reason">%1$s ລຶບອອກ %2$s. ເຫດຜົນ: %3$s</string>
+    <string name="notice_room_reject_with_reason_by_you">ທ່ານໄດ້ປະຕິເສດການເຊີນ. ເຫດຜົນ: %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s ປະຕິເສດຄຳເຊີນ. ເຫດຜົນ: %2$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">ທ່ານອອກໄປ. ເຫດຜົນ: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">ອອກ %1$s. ເຫດຜົນ: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">ທ່ານໄດ້ອອກຈາກຫ້ອງ. ເຫດຜົນ: %1$s</string>
+    <string name="notice_room_leave_with_reason">%1$s ອອກຈາກຫ້ອງ. ເຫດຜົນ: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">ທ່ານເຂົ້າຮ່ວມ. ເຫດຜົນ: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s ເຂົ້າຮ່ວມ. ເຫດຜົນ: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">ທ່ານໄດ້ເຂົ້າຮ່ວມຫ້ອງ. ເຫດຜົນ: %1$s</string>
+    <string name="notice_room_join_with_reason">%1$s ເຂົ້າຮ່ວມຫ້ອງ. ເຫດຜົນ: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s ເຊີນທ່ານ. ເຫດຜົນ: %2$s</string>
+    <string name="notice_room_invite_with_reason_by_you">ທ່ານໄດ້ຮັບເຊີນ %1$s. ເຫດຜົນ: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s ເຊີນ %2$s. ເຫດຜົນ: %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">ການເຊື້ອເຊີນຂອງທ່ານ. ເຫດຜົນ: %1$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason">ຄຳເຊີນຂອງ %1$s. ເຫດຜົນ: %2$s</string>
+    <string name="event_status_sending_message">ກຳລັງສົ່ງຂໍ້ຄວາມ…</string>
+    <string name="event_status_sent_message">ຂໍ້ຄວາມຖືກສົ່ງ</string>
+    <string name="initial_sync_start_importing_account_data">ການຊິງຄ໌ເບື້ອງຕົ້ນ:
+\nການນໍາເຂົ້າຂໍ້ມູນບັນຊີ</string>
+    <string name="initial_sync_start_importing_account_groups">ການຊິງຄ໌ເບື້ອງຕົ້ນ:
+\nຊຸມຊົນນໍາເຂົ້າ</string>
+    <string name="initial_sync_start_importing_account_left_rooms">ການຊິງຄ໌ເບື້ອງຕົ້ນ:
+\nການນໍາເຂົ້າຫ້ອງຊ້າຍ</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">ການຊິງຄ໌ເບື້ອງຕົ້ນ:
+\nກຳລັງນຳເຂົ້າຫ້ອງຮັບເຊີນ</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">ການຊິງຄ໌ເບື້ອງຕົ້ນ:
+\nກຳລັງໂຫຼດບົດສົນທະນາຂອງທ່ານ
+\nຖ້າທ່ານໄດ້ເຂົ້າຮ່ວມຫຼາຍຫ້ອງ, ນີ້ອາດຈະໃຊ້ເວລາໄລຍະຫນຶ່ງ</string>
+    <string name="initial_sync_start_importing_account_rooms">ການຊິງຄ໌ເບື້ອງຕົ້ນ:
+\nການນໍາເຂົ້າຫ້ອງ</string>
+    <string name="initial_sync_start_importing_account_crypto">ການຊິງຄ໌ເບື້ອງຕົ້ນ:
+\nການນໍາເຂົ້າ crypto</string>
+    <string name="initial_sync_start_importing_account">ການຊິງຄ໌ເບື້ອງຕົ້ນ:
+\nກຳລັງນຳເຂົ້າບັນຊີ…</string>
+    <string name="initial_sync_start_downloading">ການຊິງຄ໌ເບື້ອງຕົ້ນ:
+\nກຳລັງດາວໂຫຼດຂໍ້ມູນ…</string>
+    <string name="initial_sync_start_server_computing">ການຊິງຄ໌ເບື້ອງຕົ້ນ:
+\nກຳລັງລໍຖ້າການຕອບສະໜອງຂອງເຊີບເວີ…</string>
+    <string name="room_displayname_empty_room_was">ຫ້ອງຫວ່າງ (ແມ່ນ %s)</string>
+    <string name="room_displayname_empty_room">ຫ້ອງຫວ່າງ</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="other">%1$s, %2$s, %3$s ແລະ %4$d ອື່ນໆ</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s ແລະ %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s ແລະ %3$s</string>
+    <string name="room_displayname_two_members">%1$s ແລະ %2$s</string>
+    <string name="room_displayname_room_invite">ເຊີນຫ້ອງ</string>
+    <string name="medium_phone_number">ເບີໂທລະສັບ</string>
+    <string name="medium_email">ທີ່ຢູ່ອີເມວ</string>
+    <string name="room_error_access_unauthorized">ທ່ານບໍ່ໄດ້ຮັບອະນຸຍາດໃຫ້ເຂົ້າຮ່ວມຫ້ອງນີ້</string>
+    <string name="matrix_error">Matrix ຜິດພາດ</string>
+    <string name="unable_to_send_message">ບໍ່ສາມາດສົ່ງຂໍ້ຄວາມໄດ້</string>
+    <string name="notice_crypto_error_unknown_inbound_session_id">ອຸປະກອນຂອງຜູ້ສົ່ງບໍ່ໄດ້ສົ່ງກະແຈໃຫ້ພວກເຮົາສໍາລັບຂໍ້ຄວາມນີ້.</string>
+    <string name="notice_crypto_unable_to_decrypt">** ບໍ່ສາມາດຖອດລະຫັດໄດ້: %s **</string>
+    <string name="notice_power_level_diff">%1$s ຈາກ %2$s ຫາ %3$s</string>
+    <string name="notice_power_level_changed">%1$s ໄດ້ປ່ຽນລະດັບພະລັງງານຂອງ %2$s.</string>
+    <string name="notice_power_level_changed_by_you">ທ່ານໄດ້ປ່ຽນລະດັບພະລັງງານຂອງ %1$s.</string>
+    <string name="power_level_custom_no_value">ກຳນົດເອງ</string>
+    <string name="power_level_custom">ກຳນົດເອງ (%1$d)</string>
+    <string name="power_level_admin">ຜູ້ເບີ່ງເເຍງລະບົບ</string>
+    <string name="power_level_default">ຄ່າເລີ່ມຕົ້ນ</string>
+    <string name="power_level_moderator">ຜູ້ຄວບຄຸມ</string>
+    <string name="notice_widget_modified_by_you">ທ່ານໄດ້ແກ້ໄຂວິດເຈັດ %1$s</string>
+    <string name="notice_widget_modified">%1$s ແກ້ໄຂວິດເຈັດ %2$s</string>
+    <string name="notice_widget_removed_by_you">ທ່ານລຶບວິດເຈັດ %1$s ອອກແລ້ວ</string>
+    <string name="notice_widget_removed">%1$s ລຶບວິດເຈັດ %2$s ອອກແລ້ວ</string>
+    <string name="notice_widget_added_by_you">ທ່ານໄດ້ເພີ່ມວິດເຈັດ %1$s ແລ້ວ</string>
+    <string name="notice_widget_added">%1$s ເພີ່ມວິດເຈັດ %2$s ແລ້ວ</string>
+    <string name="notice_room_third_party_registered_invite_by_you">ທ່ານຍອມຮັບຄຳເຊີນສຳລັບ %1$s</string>
+    <string name="notice_room_third_party_registered_invite">%1$s ຍອມຮັບຄຳເຊີນສຳລັບ %2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">ທ່ານໄດ້ຖອນຄຳເຊີນສຳລັບ %1$s ແລ້ວ</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s ຖອນຄຳເຊີນສຳລັບ %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">ທ່ານໄດ້ຖອນຄຳເຊີນສຳລັບ %1$s ເຂົ້າຮ່ວມຫ້ອງແລ້ວ</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s ຖອນຄຳເຊີນສຳລັບ %2$s ເຂົ້າຮ່ວມຫ້ອງ</string>
+    <string name="notice_direct_room_third_party_invite_by_you">ທ່ານໄດ້ຮັບເຊີນ %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s ເຊີນ %2$s</string>
+    <string name="notice_room_third_party_invite_by_you">ທ່ານໄດ້ສົ່ງຄຳເຊີນໄປຫາ %1$s ເພື່ອເຂົ້າຮ່ວມຫ້ອງ</string>
+    <string name="notice_room_third_party_invite">%1$s ສົ່ງຄຳເຊີນໃຫ້ %2$s ເຂົ້າຮ່ວມຫ້ອງ</string>
+    <string name="notice_room_avatar_removed_by_you">ທ່ານໄດ້ລຶບຮູບແທນຕົວຂອງຫ້ອງອອກແລ້ວ</string>
+    <string name="notice_room_avatar_removed">%1$s ລຶບຮູບແທນຕົວຂອງຫ້ອງອອກແລ້ວ</string>
+    <string name="notice_room_topic_removed_by_you">ທ່ານໄດ້ລຶບຫົວຂໍ້ຫ້ອງອອກ</string>
+    <string name="notice_room_topic_removed">%1$s ລຶບຫົວຂໍ້ຫ້ອງອອກ</string>
+    <string name="notice_room_name_removed_by_you">ທ່ານໄດ້ລຶບຊື່ຫ້ອງອອກ</string>
+    <string name="notice_room_name_removed">%1$s ລຶບຊື່ຫ້ອງອອກ</string>
+    <string name="notice_avatar_changed_too">(ຮູບຕົວແທນຖືກປ່ຽນແປງເຊັ່ນດຽວກັນ)</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 ເຊີບເວີທັງໝົດຖືກຫ້າມບໍ່ໃຫ້ເຂົ້າຮ່ວມ! ຫ້ອງນີ້ບໍ່ສາມາດໃຊ້ໄດ້ອີກຕໍ່ໄປ.</string>
+    <string name="notice_room_server_acl_updated_no_change">ບໍ່ມີການປ່ຽນແປງ.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• ເຊີບເວີທີ່ກົງກັບຕົວອັກສອນ IP ຖືກຫ້າມແລ້ວ.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">ເຊີບເວີທີ່ກົງກັບຕົວອັກສອນ IP ໄດ້ຖືກອະນຸຍາດແລ້ວ.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• ເຊີບເວີທີ່ກົງກັບ %s ຖືກລຶບອອກຈາກລາຍຊື່ທີ່ອະນຸຍາດແລ້ວ.</string>
+    <string name="notice_room_server_acl_updated_allowed">• ຕອນນີ້ເຊີບເວີທີ່ກົງກັບ %s ໄດ້ຖືກອະນຸຍາດແລ້ວ.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• ເຊີບເວີທີ່ກົງກັບ %s ຖືກເອົາອອກຈາກລາຍການຫ້າມແລ້ວ.</string>
+    <string name="notice_room_server_acl_updated_banned">• ຕອນນີ້ເຊີບເວີທີ່ກົງກັບ %s ຖືກຫ້າມແລ້ວ.</string>
+    <plurals name="notice_room_server_acl_changes">
+        <item quantity="other">%d ປ່ຽນແປງເຊີບເວີ ACL</item>
+    </plurals>
+    <string name="notice_room_server_acl_updated_title_by_you">ທ່ານໄດ້ປ່ຽນເຊີບເວີ ACLs ສໍາລັບຫ້ອງນີ້.</string>
+    <string name="notice_room_server_acl_updated_title">%s ໄດ້ປ່ຽນເຊີບເວີ ACLs ສໍາລັບຫ້ອງນີ້.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• ເຊີບເວີທີ່ກົງກັບຕົວອັກສອນ IP ຖືກຫ້າມ.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• ເຊີບເວີທີ່ກົງກັບຕົວອັກສອນ IP ແມ່ນອະນຸຍາດ.</string>
+    <string name="notice_room_server_acl_set_allowed">• ເຊີບເວີທີ່ກົງກັບ %s ໄດ້ຮັບອະນຸຍາດ.</string>
+    <string name="notice_room_server_acl_set_banned">• ເຊີບເວີທີ່ກົງກັບ %s ຖືກຫ້າມ.</string>
+    <string name="notice_room_server_acl_set_title_by_you">ທ່ານຕັ້ງ ACLs ເຊີບເວີສໍາລັບຫ້ອງນີ້.</string>
+    <string name="notice_room_server_acl_set_title">%s ຕັ້ງ ACL ຂອງເຊີບເວີສຳລັບຫ້ອງນີ້.</string>
+    <string name="notice_direct_room_update_by_you">ທ່ານໄດ້ຍົກລະດັບຢູ່ທີ່ນີ້.</string>
+    <string name="notice_direct_room_update">%s ຍົກລະດັບຢູ່ບ່ອນນີ້ແລ້ວ.</string>
+    <string name="notice_room_update_by_you">ທ່ານໄດ້ຍົກລະດັບຫ້ອງນີ້.</string>
+    <string name="notice_room_update">%s ໄດ້ຍົກລະດັບຫ້ອງນີ້ແລ້ວ.</string>
+    <string name="notice_room_visibility_world_readable">ຜູ້ໃດຜູ້ຫນຶ່ງ.</string>
+    <string name="notice_room_visibility_shared">ສະມາຊິກຫ້ອງທັງຫມົດ.</string>
+    <string name="notice_room_visibility_joined">ສະມາຊິກຫ້ອງທັງຫມົດ, ຈາກຈຸດທີ່ເຂົາເຈົ້າເຂົ້າຮ່ວມ.</string>
+    <string name="notice_room_visibility_invited">ສະມາຊິກຫ້ອງທັງຫມົດ, ຈາກຈຸດທີ່ເຂົາເຈົ້າໄດ້ຖືກເຊີນ.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">ທ່ານໄດ້ສ້າງຂໍ້ຄວາມໃນອະນາຄົດເຫັນໄດ້ຕໍ່ %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s ໄດ້ສ້າງຂໍ້ຄວາມອະນາຄົດເຫັນໄດ້ໂດຍ %2$s</string>
+    <string name="notice_made_future_room_visibility_by_you">ທ່ານໄດ້ສ້າງປະຫວັດຫ້ອງໃນອະນາຄົດໃຫ້ ເຫັນໄດ້%1$s</string>
+    <string name="notice_made_future_room_visibility">%1$s ສ້າງປະຫວັດຫ້ອງໃນອະນາຄົດໃຫ້ ເຫັນໄດ້%2$s</string>
+    <string name="notice_ended_call_by_you">ທ່ານສິ້ນສຸດການໂທ.</string>
+    <string name="notice_ended_call">%s ວາງສາຍ.</string>
+    <string name="notice_answered_call_by_you">ທ່ານໄດ້ຮັບສາຍ.</string>
+    <string name="notice_answered_call">%s ຮັບສາຍ.</string>
+    <string name="notice_call_candidates_by_you">ທ່ານໄດ້ສົ່ງຂໍ້ມູນເພື່ອຕັ້ງຄ່າການໂທ.</string>
+    <string name="notice_call_candidates">%s ສົ່ງຂໍ້ມູນເພື່ອຕັ້ງຄ່າການໂທ.</string>
+    <string name="notice_placed_voice_call_by_you">ທ່ານໄດ້ໂທດ້ວຍສຽງ.</string>
+    <string name="notice_placed_voice_call">%s ໂທອອກ.</string>
+    <string name="notice_placed_video_call_by_you">ທ່ານໄດ້ໂທວິດີໂອ.</string>
+    <string name="notice_placed_video_call">%s ໂທດ້ວຍວິດີໂອ.</string>
+    <string name="notice_room_name_changed_by_you">ທ່ານໄດ້ປ່ຽນຊື່ຫ້ອງເປັນ: %1$s</string>
+    <string name="notice_room_name_changed">%1$s ໄດ້ປ່ຽນຊື່ຫ້ອງເປັນ: %2$s</string>
+    <string name="notice_room_avatar_changed_by_you">ທ່ານໄດ້ປ່ຽນຮູບແທນຕົວຂອງຫ້ອງ</string>
+    <string name="notice_room_avatar_changed">%1$s ໄດ້ປ່ຽນຮູບແທນຕົວຂອງຫ້ອງ</string>
+    <string name="notice_room_topic_changed_by_you">ທ່ານໄດ້ປ່ຽນຫົວຂໍ້ເປັນ: %1$s</string>
+    <string name="notice_room_topic_changed">%1$s ໄດ້ປ່ຽນຫົວຂໍ້ເປັນ: %2$s</string>
+    <string name="notice_display_name_removed_by_you">ທ່ານໄດ້ລຶບການສະເເດງຊື່ຂອງເຈົ້າອອກ (ມັນແມ່ນ %1$s)</string>
+    <string name="notice_display_name_removed">%1$s ລຶບການສະເເດງຊື່ຂອງເຂົາເຈົ້າອອກ (ມັນແມ່ນ %2$s)</string>
+    <string name="notice_display_name_changed_from_by_you">ທ່ານໄດ້ປ່ຽນການສະເເດງຊື່ຂອງທ່ານຈາກ %1$s ເປັນ %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s ໄດ້ປ່ຽນການສະແດງຊື່ຂອງເຂົາເຈົ້າຈາກ %2$s ເປັນ %3$s</string>
+    <string name="notice_display_name_set_by_you">ທ່ານກຳນົດການສະເເດງຊື່ຊື່ຂອງທ່ານເປັນ %1$s</string>
+    <string name="notice_display_name_set">%1$s ກຳນົດນົດການສະແດງຊື່ຂອງເຂົາເຈົ້າເປັນ %2$s</string>
+    <string name="notice_avatar_url_changed_by_you">ທ່ານໄດ້ປ່ຽນຮູບແທນຕົວຂອງເຈົ້າແລ້ວ</string>
+    <string name="notice_avatar_url_changed">%1$s ໄດ້ປ່ຽນຮູບແທນຕົວຂອງເຂົາເຈົ້າແລ້ວ</string>
+    <string name="notice_room_withdraw_by_you">ທ່ານໄດ້ຖອນຄຳເຊີນຂອງ %1$s ແລ້ວ</string>
+    <string name="notice_room_withdraw">%1$s ຖອນຄຳເຊີນຂອງ %2$s</string>
+    <string name="notice_room_ban_by_you">ທ່ານໄດ້ຫ້າມ%1$s</string>
+    <string name="notice_room_ban">%1$s ໄດ້ຫ້າມ %2$s</string>
+    <string name="notice_room_unban_by_you">ທ່ານໄດ້ຍົກເລີກການຫ້າມ %1$s</string>
+    <string name="notice_room_unban">%1$s ໄດ້ຍົກເລີກການຫ້າມ %2$s</string>
+    <string name="notice_room_remove_by_you">ທ່ານໄດ້ລຶບ %1$s ອອກແລ້ວ</string>
+    <string name="notice_room_remove">%1$sໄດ້ ລຶບອອກ %2$s</string>
+    <string name="notice_room_reject_by_you">ທ່ານໄດ້ປະຕິເສດການເຊີນ</string>
+    <string name="notice_room_reject">%1$s ໄດ້ປະຕິເສດຄຳເຊີນ</string>
+    <string name="notice_direct_room_leave_by_you">ທ່ານໄດ້ອອກຈາກຫ້ອງ</string>
+    <string name="notice_direct_room_leave">%1$s ໄດ້ອອກຈາກຫ້ອງ</string>
+    <string name="notice_room_leave_by_you">ທ່ານໄດ້ອອກຈາກຫ້ອງ</string>
+    <string name="notice_room_leave">%1$s ອອກຈາກຫ້ອງ</string>
+    <string name="notice_direct_room_join_by_you">ທ່ານໄດ້ເຂົ້າຮ່ວມ</string>
+    <string name="notice_direct_room_join">%1$s ໄດ້ເຂົ້າຮ່ວມ</string>
+    <string name="notice_room_join_by_you">ທ່ານໄດ້ເຂົ້າຮ່ວມຫ້ອງ</string>
+    <string name="notice_room_join">%1$s ໄດ້ເຂົ້າຮ່ວມຫ້ອງ</string>
+    <string name="notice_room_invite_you">%1$s ໄດ້ເຊີນທ່ານ</string>
+    <string name="notice_room_invite_by_you">ທ່ານໄດ້ເຊີນ %1$s</string>
+    <string name="notice_room_invite">%1$s ໄດ້ເຊີນ %2$s</string>
+    <string name="notice_direct_room_created_by_you">ທ່ານໄດ້ຕັ້ງກະທູ້ສົນທະນາ</string>
+    <string name="notice_direct_room_created">%1$s ໄດ້ຕັ້ງກະທູ້ສົນທະນາ</string>
+    <string name="notice_room_created_by_you">ທ່ານໄດ້ສ້າງຫ້ອງ</string>
+    <string name="notice_room_created">%1$s ໄດ້ສ້າງຫ້ອງ</string>
+    <string name="notice_room_invite_no_invitee_by_you">ບັດເຊີນຂອງທ່ານ</string>
+    <string name="notice_room_invite_no_invitee">ການເຊີນຂອງ %s</string>
+    <string name="no_message_edits_found">ບໍ່ພົບການແກ້ໄຂ</string>
+    <string name="message_edits">ການແກ້ໄຂຂໍ້ຄວາມ</string>
+    <string name="edited_suffix">(ດັດແກ້ແລ້ວ)</string>
+    <string name="downloaded_file">ໄຟລ໌ %1$s ຖືກດາວໂຫຼດແລ້ວ!</string>
+    <string name="send_file_step_compressing_video">ກຳລັງບີບອັດວິດີໂອ %d%%</string>
+    <string name="send_feedback_threads_info">ກະທູ້ກຳລັງດຳເນີນຢູ່ພ້ອມກັບຄຸນສົມບັດໃໝ່ທີ່ກຳລັງຈະມາຮອດ ເຊັ່ນ: ການແຈ້ງເຕືອນປັບປຸງໃຫ້ດີຂຶ້ນ. ພວກເຮົາຢາກໄດ້ຍິນຄໍາຕິຊົມຂອງທ່ານ!</string>
+    <string name="push_gateway_item_app_display_name">app_display_name:</string>
+    <string name="send_file_step_compressing_image">ກຳລັງບີບອັດຮູບ…</string>
+    <string name="send_file_step_sending_file">ກຳລັງສົ່ງໄຟລ໌ (%1$s / %2$s)</string>
+    <string name="send_file_step_encrypting_file">ກຳລັງເຂົ້າລະຫັດໄຟລ໌…</string>
+    <string name="send_file_step_sending_thumbnail">ກຳລັງສົ່ງຮູບຕົວຢ່າງ (%1$s / %2$s)</string>
+    <string name="send_file_step_encrypting_thumbnail">ກຳລັງເຂົ້າລະຫັດຮູບຕົວຢ່າງ…</string>
+    <string name="send_file_step_idle">ກຳລັງລໍຖ້າ…</string>
+    <string name="bottom_action_people_x">ຂໍ້ຄວາມໂດຍກົງ</string>
+    <string name="settings_labs_show_complete_history_in_encrypted_room">ສະແດງປະຫວັດຄົບຖ້ວນຢູ່ໃນຫ້ອງທີ່ເຂົ້າລະຫັດໄວ້</string>
+    <string name="settings_labs_show_hidden_events_in_timeline">ສະແດງເຫດການທີ່ເຊື່ອງໄວ້ໃນທາມລາຍ</string>
+    <string name="beta">ເບຕ້າ</string>
+    <string name="send_feedback_threads_title">ຄວາມຄິດເຫັນຂອງກະທູ້ Beta</string>
+    <string name="give_feedback_threads">ໃຫ້ຄໍາຄິດເຫັນ</string>
+    <string name="give_feedback" tools:ignore="UnusedResources">ໃຫ້ຄໍາຄິດເຫັນ</string>
+    <string name="feedback_failed">ສົ່ງຄຳຕິຊົມບໍ່ສຳເລັດ (%s)</string>
+    <string name="feedback_sent">ຂໍຂອບໃຈ, ຄໍາຄຶດຄໍາເຫັນຂອງທ່ານໄດ້ຖືກສົ່ງສໍາເລັດແລ້ວ</string>
+    <string name="you_may_contact_me">ທ່ານສາມາດຕິດຕໍ່ຂ້ອຍໄດ້ ຖ້າທ່ານມີຄໍາຖາມຕິດຕາມ</string>
+    <string name="send_feedback_space_info">ທ່ານກຳລັງໃຊ້ພື້ນທີ່ເວີຊັ້ນເບຕ້າ. ຄໍາຕິຊົມຂອງທ່ານຈະຊ່ວຍແຈ້ງໃຫ້ເວີຊັ້ນຕໍ່ໄປຊາບ. ເເພລັດຟອມແລະຊື່ຜູ້ໃຊ້ຂອງທ່ານຈະຖືກບັນທຶກໄວ້ເພື່ອຊ່ວຍໃຫ້ພວກເຮົາໃຊ້ຄໍາຕິຊົມຂອງທ່ານເທົ່າທີ່ພວກເຮົາສາມາດເຮັດໄດ້.</string>
+    <string name="feedback">ຄໍາຕິຊົມ</string>
+    <string name="send_feedback_space_title">ຄຳຕິຊົມຂອງພື້ນທີ່</string>
+    <string name="beta_title_bottom_sheet_action">ເບຕ້າ</string>
+    <string name="send_suggestion_failed">ສົ່ງຄຳແນະນຳບໍ່ສຳເລັດ (%s)</string>
+    <string name="send_suggestion_sent">ຂອບໃຈ, ຄຳແນະນຳໄດ້ສົ່ງສຳເລັດແລ້ວ</string>
+    <string name="send_suggestion_report_placeholder">ອະທິບາຍຄໍາແນະນໍາຂອງທ່ານທີ່ນີ້</string>
+    <string name="send_suggestion_content">ກະລຸນາຂຽນຄໍາແນະນໍາຂອງທ່ານຂ້າງລຸ່ມນີ້.</string>
+    <string name="send_suggestion">ໃຫ້ຄໍາແນະນໍາ</string>
+    <string name="settings_troubleshoot_test_token_registration_quick_fix">ລົງທະບຽນ token</string>
+    <string name="preference_system_settings">ການຕັ້ງຄ່າລະບົບ</string>
+    <string name="preference_versions">ເວີຊັ້ນ</string>
+    <string name="preference_help_summary">ຂໍຄວາມຊ່ວຍເຫຼືອໃນການນຳໃຊ້ ${app_name}</string>
+    <string name="preference_help_title">ຊ່ວຍເຫຼືອ ແລະ ສະຫນັບສະຫນູນ</string>
+    <string name="preference_help">ຊ່ວຍເຫຼືອ</string>
+    <string name="preference_root_legals">ກົດໝາຍ</string>
+    <string name="preference_root_help_about">ຊ່ວຍເຫຼືອ &amp; ກ່ຽວກັບ</string>
+    <string name="preference_voice_and_video">ສຽງ &amp; ວິດີໂອ</string>
+    <string name="push_gateway_item_format">ຮູບແບບ:</string>
+    <string name="push_gateway_item_url">Url:</string>
+    <string name="push_gateway_item_device_name">session_name:</string>
+    <string name="push_gateway_item_push_key">push_key:</string>
+    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="settings_push_gateway_no_pushers">ບໍ່ມີປະຕູທາງpushທີ່ລົງທະບຽນ</string>
+    <string name="settings_push_rules_no_rules">ບໍ່ໄດ້ກໍານົດກົດລະບຽບການຊຸກຍູ້</string>
+    <string name="settings_push_rules">ກົດລະບຽບການຊຸກຍູ້</string>
+    <string name="settings_security_and_privacy">ຄວາມປອດໄພ &amp; ຄວາມເປັນສ່ວນຕົວ</string>
+    <string name="settings_preferences">ຄວາມມັກ</string>
+    <string name="settings_general_title">ທົ່ວໄປ</string>
+    <string name="navigate_to_thread_when_already_in_the_thread">ທ່ານກຳລັງເບິ່ງກະທູ້ນີ້ຢູ່!</string>
+    <string name="navigate_to_room_when_already_in_the_room">ທ່ານກຳລັງເບິ່ງຫ້ອງນີ້ຢູ່ແລ້ວ!</string>
+    <string name="settings_other_third_party_notices">ແຈ້ງການອື່ນໆຂອງພາກສ່ວນທີສາມ</string>
+    <string name="settings_sdk_version">ສະບັບ Matrix SDK</string>
+    <string name="import_e2e_keys_from_file">ນຳເຂົ້າກະແຈ e2e ຈາກໄຟລ໌ \"%1$s\".</string>
+    <string name="keys_backup_unable_to_get_keys_backup_data">ເກີດຄວາມຜິດພາດໃນການຮັບເອົາຂໍ້ມູນສຳຮອງກະແຈ</string>
+    <string name="keys_backup_unable_to_get_trust_info">ເກີດຄວາມຜິດພາດໃນການຮັບຂໍ້ມູນໜ້າເຊື່ອຖື</string>
+    <string name="create_room_federation_error">ຫ້ອງໄດ້ຖືກສ້າງຂື້ນ, ແຕ່ການເຊີນບາງອັນບໍ່ໄດ້ຖືກສົ່ງໄປດ້ວຍເຫດຜົນຕໍ່ໄປນີ້:%s</string>
+    <string name="create_room_public_description">ທຸກຄົນຈະສາມາດເຂົ້າຮ່ວມຫ້ອງນີ້ໄດ້</string>
+    <string name="create_room_public_title">ສາທາລະນະ</string>
+    <string name="create_room_settings_section">ການຕັ້ງຄ່າຫ້ອງ</string>
+    <string name="create_room_topic_hint">ຫົວຂໍ້</string>
+    <string name="create_room_topic_section">ຫົວຂໍ້ຫ້ອງ (ທາງເລືອກ)</string>
+    <string name="create_room_name_hint">ຊື່</string>
+    <string name="create_room_name_section">ຊື່ຫ້ອງ</string>
+    <string name="create_room_action_create">ສ້າງ</string>
+    <string name="fab_menu_create_chat">ຂໍ້ຄວາມໂດຍກົງ</string>
+    <string name="fab_menu_create_room">ຫ້ອງ</string>
+    <string name="room_preview_no_preview_join">ຫ້ອງນີ້ບໍ່ສາມາດເບິ່ງຕົວຢ່າງໄດ້. ທ່ານຕ້ອງການເຂົ້າຮ່ວມບໍ\?</string>
+    <string name="room_preview_not_found">ຫ້ອງນີ້ບໍ່ສາມາດເຂົ້າເຖິງໄດ້ໃນເວລານີ້.
+\nລອງໃໝ່ໃນພາຍຫຼັງ, ຫຼືຖາມຜູ້ເບິ່ງແຍງຫ້ອງເພື່ອກວດເບິ່ງວ່າທ່ານມີການເຂົ້າເຖິງຫຼືບໍ່.</string>
+    <string name="room_preview_no_preview">ຫ້ອງນີ້ບໍ່ສາມາດເບິ່ງຕົວຢ່າງໄດ້</string>
+    <string name="group_all_communities">ຊຸມຊົນທັງໝົດ</string>
+    <string name="please_wait">ກະລຸນາລໍຖ້າ…</string>
+    <string name="change_room_directory_network">ປ່ຽນເຄືອຂ່າຍ</string>
+    <string name="error_no_network">ບໍ່ມີເຄືອຂ່າຍ. ກະລຸນາກວດເບິ່ງການເຊື່ອມຕໍ່ອິນເຕີເນັດຂອງທ່ານ.</string>
+    <string name="create_new_space">ສ້າງພື້ນທີ່ໃຫມ່</string>
+    <string name="create_new_room">ສ້າງຫ້ອງໃຫມ່</string>
+    <string name="malformed_message">ເຫດການບໍ່ຖືກຕ້ອງ, ບໍ່ສາມາດສະແດງໄດ້</string>
+    <string name="event_redacted_by_admin_reason">ຄວບຄຸມເຫດການໂດຍຜູ້ເບິ່ງແຍງຫ້ອງ</string>
+    <string name="event_redacted_by_user_reason">ເຫດການຖືກລຶບໂດຍຜູ້ໃຊ້</string>
+    <string name="settings_show_redacted_summary">ສະແດງຕົວຍຶດສໍາລັບຂໍ້ຄວາມທີ່ຖືກລົບອອກ</string>
+    <string name="settings_show_redacted">ສະແດງຂໍ້ຄວາມທີ່ຖືກລືບອອກ</string>
+    <string name="event_redacted">ຂໍ້ຄວາມຖືກລຶບ</string>
+    <string name="reactions">ການໂຕ້ຕອບ</string>
+    <string name="message_view_reaction">ເບິ່ງການໂຕ້ຕອບ</string>
+    <string name="message_add_reaction">ເພີ່ມປະຕິກິລິຍາ</string>
+    <string name="title_activity_emoji_reaction_picker">ປະຕິກິລິຍາ</string>
+    <string name="room_list_rooms_empty_body">ຫ້ອງຂອງທ່ານຈະຖືກສະແດງຢູ່ທີ່ນີ້. ແຕະ + ຂວາລຸ່ມເພື່ອຊອກຫາອັນທີ່ມີຢູ່ແລ້ວ ຫຼື ເລີ່ມຕົ້ນໂດຍທ່ານເອງ.</string>
+    <string name="room_list_rooms_empty_title">ຫ້ອງ</string>
+    <string name="room_list_people_empty_body">ການສົນທະນາທາງຂໍ້ຄວາມໂດຍກົງຂອງທ່ານຈະຖືກສະແດງຢູ່ທີ່ນີ້. ແຕະ + ຂວາລຸ່ມເພື່ອເລີ່ມຕົ້ນ.</string>
+    <string name="room_list_people_empty_title">ການສົນທະນາ</string>
+    <string name="settings_send_message_with_enter_summary">ປຸ່ມEnter ຂອງແປ້ນພິມຈະສົ່ງຂໍ້ຄວາມແທນການເພີ່ມຕົວແບ່ງແຖວ</string>
+    <string name="settings_send_message_with_enter">ສົ່ງຂໍ້ຄວາມດ້ວຍການກົດ enter</string>
+    <string name="settings_preview_media_before_sending">ເບິ່ງຕົວຢ່າງສື່ກ່ອນສົ່ງ</string>
+    <string name="settings_vibrate_on_mention">ສັ່ນເມື່ອກ່າວເຖິງຜູ້ໃຊ້</string>
+    <string name="settings_show_avatar_display_name_changes_messages_summary">ລວມທັງຮູບແທນຕົວ ແລະ ການປ່ຽນແປງການສະແດງຊື່.</string>
+    <string name="settings_show_avatar_display_name_changes_messages">ສະແດງບັນຊີ</string>
+    <string name="settings_show_join_leave_messages_summary">ການເຊີນ, ລຶບ, ແລະການຫ້າມແມ່ນບໍ່ມີຜົນກະທົບ.</string>
+    <string name="settings_show_join_leave_messages">ສະແດງການເຂົ້າຮ່ວມ ແລະ ອອກຈາກເຫດການ</string>
+    <string name="settings_chat_effects_description">ໃຊ້ຄໍາສັ່ງ /confetti ຫຼືສົ່ງຂໍ້ຄວາມທີ່ມີ ❄️ ຫຼື 🎉</string>
+    <string name="settings_chat_effects_title">ສະແດງຜົນການສົນທະນາ</string>
+    <string name="ssl_unexpected_existing_expl">ໃບຮັບຮອງໄດ້ປ່ຽນຈາກອັນທີ່ເຊື່ອຖືໄດ້. ນີ້ແມ່ນຜິດປົກກະຕິ. ຂໍແນະນຳໃຫ້ທ່ານຢ່າຍອມຮັບໃບຮັບຮອງໃໝ່ນີ້.</string>
+    <string name="room_list_catchup_empty_body">ທ່ານບໍ່ມີຂໍ້ຄວາມທີ່ຍັງບໍ່ໄດ້ອ່ານ</string>
+    <string name="invited_by">ເຊີນໂດຍ %s</string>
+    <string name="send_you_invite">ສົ່ງຄຳເຊີນໃຫ້ທ່ານ</string>
+    <string name="global_retry">ລອງໃໝ່</string>
+    <string name="view_in_room">ເບິ່ງຢູ່ໃນຫ້ອງ</string>
+    <string name="reply_in_thread">ຕອບໃນກະທູ້</string>
+    <string name="reply">ຕອບ</string>
+    <string name="edit">ແກ້ໄຂ</string>
+    <string name="error_user_already_logged_in">ເບິ່ງຄືວ່າທ່ານກຳລັງພະຍາຍາມເຊື່ອມຕໍ່ຫາ homeserver ອື່ນ. ທ່ານຕ້ອງການອອກຈາກລະບົບບໍ\?</string>
+    <string name="identity_server_not_defined">ທ່ານຍັງບໍ່ໄດ້ໃຊ້ເຊີບເວີໃດໆ</string>
+    <string name="sas_error_unknown">ຄວາມຜິດພາດທີ່ບໍ່ຮູ້ຈັກ</string>
+    <string name="sas_incoming_request_notif_content">%s ຕ້ອງການກວດສອບລະບົບຂອງທ່ານ</string>
+    <string name="sas_incoming_request_notif_title">ການຮ້ອງຂໍການຢັ້ງຢືນ</string>
+    <string name="sas_got_it">ໄດ້ແລ້ວ</string>
+    <string name="sas_verified">ຢືນຢັນແລ້ວ!</string>
+    <string name="keys_backup_info_title_signature">ລາຍເຊັນ</string>
+    <string name="keys_backup_info_title_algorithm">ສູດການຄິດໄລ່</string>
+    <string name="keys_backup_info_title_version">ເວີຊັ້ນ</string>
+    <plurals name="keys_backup_info_keys_backing_up">
+        <item quantity="other">ກຳລັງສຳຮອງຂໍ້ມູນ %d ກະແຈ…</item>
+    </plurals>
+    <string name="keys_backup_info_keys_all_backup_up">ກະແຈທັງໝົດຖືກສຳຮອງໄວ້</string>
+    <string name="secure_backup_setup">ຕັ້ງຄ່າການສໍາຮອງຂໍ້ມູນທີ່ປອດໄພ</string>
+    <string name="keys_backup_banner_in_progress">ກຳລັງສຳຮອງຂໍ້ມູນກະແຈຂອງທ່ານ. ອັນນີ້ອາດຈະໃຊ້ເວລາຫຼາຍນາທີ…</string>
+    <string name="keys_backup_banner_update_line2">ຈັດການການ ສຳຮອງຂໍ້ມູນກະເເຈ</string>
+    <string name="keys_backup_banner_update_line1">ລະຫັດຂໍ້ຄວາມໃໝ່ທີ່ປອດໄພ</string>
+    <string name="keys_backup_banner_recover_line2">ການສຳຮອງຂໍ້ມູນກະເເຈ</string>
+    <string name="keys_backup_banner_recover_line1">ຂໍ້ຄວາມເຂົ້າລະຫັດຈະບໍ່ສູນເສຍ</string>
+    <string name="secure_backup_banner_setup_line2">ປ້ອງກັນການສູນເສຍການເຂົ້າເຖິງຂໍ້ຄວາມ ແລະຂໍ້ມູນທີ່ຖືກເຂົ້າລະຫັດ</string>
+    <string name="secure_backup_banner_setup_line1">ການສໍາຮອງທີ່ປອດໄພ</string>
+    <string name="keys_backup_settings_delete_confirm_message">ລຶບການເຂົ້າລະຫັດສຳຮອງຂອງທ່ານອອກຈາກເຊີບເວີບໍ\? ທ່ານຈະບໍ່ສາມາດໃຊ້ລະຫັດກູ້ຄືນຂອງທ່ານເພື່ອອ່ານປະຫວັດຂໍ້ຄວາມທີ່ຖືກເຂົ້າລະຫັດໄດ້ອີກຕໍ່ໄປ.</string>
+    <string name="keys_backup_settings_delete_confirm_title">ລຶບການສຳຮອງຂໍ້ມູນ</string>
+    <string name="keys_backup_settings_checking_backup_state">ກຳລັງກວດສອບສະຖານະການສຳຮອງ</string>
+    <string name="keys_backup_settings_deleting_backup">ກຳລັງລຶບການສຳຮອງຂໍ້ມູນ…</string>
+    <string name="keys_backup_settings_untrusted_backup">ການສຳຮອງຂໍ້ມູນກະເເຈ ໃນລະບົບນີ້, ກູ້ຂໍ້ມູນດ້ວຍປະໂຫຍກຄວາມປອດໄພ ຫຼື ກູ້ຂໍ້ມູນກະແຈຂອງທ່ານດຽວນີ້.</string>
+    <string name="keys_backup_settings_invalid_signature_from_unverified_device">ການສຳຮອງຂໍ້ມູນມີລາຍເຊັນບໍ່ໄດ້ຮັບການຢັ້ງຢືນທີ່ຖືກຕ້ອງ %s</string>
+    <string name="keys_backup_settings_invalid_signature_from_verified_device">ການສຳຮອງຂໍ້ມູນມີລາຍເຊັນບໍ່ຖືກຕ້ອງໄດ້ຢືນຢັນຈາກລະບົບແລ້ວ %s</string>
+    <string name="keys_backup_settings_valid_signature_from_unverified_device">ການສຳຮອງຂໍ້ມູນມີລາຍເຊັນທີ່ຖືກຕ້ອງຈາກລະບົບທີ່ບໍ່ໄດ້ຜ່ານການຢືນຢັນ %s</string>
+    <string name="keys_backup_settings_valid_signature_from_verified_device">ການສຳຮອງຂໍ້ມູນ ມີລາຍເຊັນທີ່ຖືກຕ້ອງຈາກລະບົບທີ່ຢືນຢັນແລ້ວ %s.</string>
+    <string name="keys_backup_settings_valid_signature_from_this_device">ການສຳຮອງຂໍ້ມູນ ມີລາຍເຊັນທີ່ຖືກຕ້ອງຈາກລະບົບນີ້.</string>
+    <string name="keys_backup_settings_signature_from_unknown_device">ກູ້ຂໍ້ມູນມີລາຍເຊັນຈາກລະບົບທີ່ບໍ່ຮູ້ຈັກກັບ ID %s.</string>
+    <string name="keys_backup_settings_status_not_setup">ກະແຈຂອງທ່ານບໍ່ໄດ້ສຳຮອງຂໍ້ມູນຈາກລະບົບນີ້.</string>
+    <string name="keys_backup_settings_status_ko">ການສຳຮອງຂໍ້ມູນກະເເຈບໍ່ໄດ້ໃຊ້ງານຢູ່ໃນລະບົບນີ້.</string>
+    <string name="keys_backup_settings_status_ok">ການສຳຮອງຂໍ້ມູນກະເເຈ ໄດ້ຖືກຕັ້ງຄ່າຢ່າງຖືກຕ້ອງສໍາລັບລະບົບນີ້.</string>
+    <string name="keys_backup_settings_delete_backup_button">ລຶບການສຳຮອງຂໍ້ມູນ</string>
+    <string name="keys_backup_settings_restore_backup_button">ກູ້ຄືນຈາກການສໍາຮອງຂໍ້ມູນ</string>
+    <string name="keys_backup_get_version_error">ການໂຫຼດລະຫັດການກູ້ຄືນຫຼ້າສຸດບໍ່ສຳເລັດ(%s).</string>
+    <plurals name="keys_backup_restore_success_description_part2">
+        <item quantity="other">%d ກະແຈໃໝ່ໄດ້ຖືກເພີ່ມໃສ່ໃນລະບົບນີ້.</item>
+    </plurals>
+    <plurals name="keys_backup_restore_success_description_part1">
+        <item quantity="other">ກູ້ຄືນການສຳຮອງຂໍ້ມູນດ້ວຍກະແຈ %d ແລ້ວ.</item>
+    </plurals>
+    <string name="keys_backup_restore_success_title">ກູ້ຂໍ້ມູນຄືນມາ %s !</string>
+    <string name="keys_backup_recovery_code_error_decrypt">ການສຳຮອງຂໍ້ມູນບໍ່ສາມາດຖອດລະຫັດດ້ວຍກະແຈການກູ້ຂໍ້ມູນນີ້ໄດ້: ກະລຸນາກວດສອບວ່າທ່ານໃສ່ລະຫັດການກູ້ຂໍ້ມູນທີ່ຖືກຕ້ອງແລ້ວ.</string>
+    <string name="keys_backup_recovery_code_empty_error_message">ກະລຸນາໃສ່ລະຫັດການກູ້ຂໍ້ມູນ</string>
+    <string name="keys_backup_unlock_button">ປົດລັອກປະຫວັດ</string>
+    <string name="keys_backup_restoring_importing_keys_waiting_message">ກຳລັງນຳເຂົ້າກະແຈ…</string>
+    <string name="keys_backup_restoring_downloading_backup_waiting_message">ກຳລັງດາວໂຫຼດກະແຈ…</string>
+    <string name="keys_backup_restoring_computing_key_waiting_message">ກຳລັງກູ້ຄືນລະຫັດຄອມພິວເຕີ…</string>
+    <string name="keys_backup_restoring_waiting_message">ການກູ້ຄືນການສໍາຮອງຂໍ້ມູນ:</string>
+    <string name="keys_backup_passphrase_error_decrypt">ການສຳຮອງຂໍ້ມູນບໍ່ສາມາດຖອດລະຫັດດ້ວຍປະໂຫຍກຄວາມປອດໄພນີ້: ກະລຸນາກວດສອບວ່າທ່ານໃສ່ລະຫັດຜ່ານການກູ້ຂໍ້ມູນທີ່ຖືກຕ້ອງແລ້ວ.</string>
+    <string name="keys_backup_restore_with_key_helper">ກະແຈການກູ້ຄືນຂອງທ່ານສູນເສຍ\? ທ່ານສາມາດຕັ້ງຄ່າອັນໃໝ່ໄດ້ໃນການຕັ້ງຄ່າ.</string>
+    <string name="keys_backup_restore_key_enter_hint">ກະລຸນາໃສ່ລະຫັດການກູ້ຄຶນ</string>
+    <string name="keys_backup_restore_with_recovery_key">ໃຊ້ກະແຈການກູ້ຂໍ້ມູນຂອງທ່ານເພື່ອປົດລັອກປະຫວັດຂໍ້ຄວາມທີ່ເຂົ້າລະຫັດໄວ້</string>
+    <string name="keys_backup_restore_with_passphrase_helper_with_link">ບໍ່ຮູ້ລະຫັດຜ່ານການກູ້ຂໍ້ມູນຂອງທ່ານ, ທ່ານສາມາດ %s ໄດ້.</string>
+    <string name="keys_backup_restore_use_recovery_key">ໃຊ້ລະຫັດການກູ້ຄືນຂອງທ່ານ</string>
+    <string name="keys_backup_restore_with_passphrase">ໃຊ້ລະຫັດຜ່ານການກູ້ຂໍ້ມູນຂອງທ່ານເພື່ອປົດລັອກປະຫວັດຂໍ້ຄວາມທີ່ເຂົ້າລະຫັດໄວ້</string>
+    <string name="keys_backup_restore_is_getting_backup_version">ກຳລັງດຶງເອົາເວີຊັນສຳຮອງ…</string>
+    <string name="keys_backup_setup_skip_msg">ທ່ານອາດຈະສູນເສຍການເຂົ້າເຖິງຂໍ້ຄວາມຂອງທ່ານຖ້າທ່ານອອກຈາກລະບົບຫຼືສູນເສຍອຸປະກອນນີ້.</string>
+    <string name="keys_backup_setup_skip_title">ທ່ານແນ່ໃຈບໍ່\?</string>
+    <string name="unexpected_error">ຄວາມຜິດພາດທີ່ບໍ່ຄາດຄິດ</string>
+    <string name="recovery_key">ລະຫັດການກູ້ຄືນ</string>
+    <string name="analytics_opt_in_list_item_2">ພວກເຮົາ &lt;b&gt;ບໍ່&lt;/b&gt; ແບ່ງປັນຂໍ້ມູນໃຫ້ພາກສ່ວນທີສາມ</string>
+    <string name="analytics_opt_in_list_item_1">ພວກເຮົາ &lt;b&gt;ບໍ່&lt;/b&gt; ບັນທຶກ ຫຼື ບັນທຶກຂໍ້ມູນໜ້າປົກບັນຊີໃດໆ</string>
+    <string name="analytics_opt_in_content_link">ທີ່ນີ້</string>
+    <string name="analytics_opt_in_content">ຊ່ວຍພວກເຮົາລະບຸບັນຫາ ແລະປັບປຸງ ${app_name} ໂດຍການແບ່ງປັນຂໍ້ມູນການນຳໃຊ້ທີ່ບໍ່ເປີດເຜີຍຊື່. ເພື່ອເຂົ້າໃຈວິທີໃຊ້ຫຼາຍອຸປະກອນ, ພວກເຮົາຈະສ້າງຕົວກຳນົດແບບສຸ່ມ, ແບ່ງປັນໂດຍອຸປະກອນຂອງທ່ານ.
+\n
+\nທ່ານສາມາດອ່ານເງື່ອນໄຂທັງໝົດຂອງພວກເຮົາໄດ້ %s.</string>
+    <string name="analytics_opt_in_title">ຊ່ວຍປັບປຸງ ${app_name}</string>
+    <string name="settings_opt_in_of_analytics_summary">${app_name} ລວບລວມການວິເຄາະທີ່ບໍ່ເປີດເຜີຍຊື່ເພື່ອໃຫ້ພວກເຮົາປັບປຸງແອັບພລິເຄຊັນ.</string>
+    <string name="settings_opt_in_of_analytics">ສົ່ງຂໍ້ມູນການວິເຄາະ</string>
+    <string name="settings_analytics">ການວິເຄາະ</string>
+    <string name="settings_discovery_manage">ຈັດການການຕັ້ງຄ່າການຄົ້ນພົບຂອງທ່ານ.</string>
+    <string name="settings_discovery_category">ການຄົ້ນພົບ</string>
+    <string name="settings_deactivate_my_account">ປິດການນຳໃຊ້ບັນຊີຂອງຂ້ອຍ</string>
+    <string name="settings_deactivate_account_section">ປິດການນຳໃຊ້ບັນຊີ</string>
+    <string name="reset_secure_backup_warning">ນີ້ຈະປ່ຽນແທນ ຫຼືປະໂຫຍກປັດຈຸບັນຂອງທ່ານ.</string>
+    <string name="reset_secure_backup_title">ສ້າງກະແຈຄວາມປອດໄພໃໝ່ ຫຼືຕັ້ງປະໂຫຍກຄວາມປອດໄພໃໝ່ສຳລັບການສຳຮອງຂໍ້ມູນທີ່ມີຢູ່ແລ້ວຂອງທ່ານ.</string>
+    <string name="settings_secure_backup_section_info">ປ້ອງກັນການສູນເສຍການເຂົ້າເຖິງຂໍ້ຄວາມ &amp; ຂໍ້ມູນທີ່ຖືກເຂົ້າລະຫັດໂດຍການສໍາຮອງການເຂົ້າລະຫັດຢູ່ໃນເຊີບເວິຂອງທ່ານ.</string>
+    <string name="settings_secure_backup_enter_to_setup">ຕັ້ງຄ່າໃນອຸປະກອນນີ້</string>
+    <string name="settings_secure_backup_reset">ຕັ້ງຄ່າການສໍາຮອງຂໍ້ມູນທີ່ປອດໄພຄືນໃໝ່</string>
+    <string name="settings_secure_backup_setup">ຕັ້ງຄ່າການສໍາຮອງຂໍ້ມູນທີ່ປອດໄພ</string>
+    <string name="settings_secure_backup_section_title">ການສໍາຮອງທີ່ປອດໄພ</string>
+    <string name="settings_show_emoji_keyboard_summary">ເພີ່ມປຸ່ມໃສ່ຕົວຂຽນຂໍ້ຄວາມເພື່ອເປີດແປ້ນພິມ emoji</string>
+    <string name="settings_show_emoji_keyboard">ສະແດງແປ້ນພິມ emoji</string>
+    <string name="keys_backup_setup_step3_generating_key_status">ການສ້າງລະຫັດການກຸ້ຂໍ້ມູນໂດຍໃຊ້ປະໂຫຍກລະຫັດຜ່ານ, ຂະບວນການນີ້ສາມາດໃຊ້ເວລາຫຼາຍວິນາທີ.</string>
+    <string name="keys_backup_setup_step3_share_intent_chooser_title">ແບ່ງປັນລະຫັດການກູ້ຂໍ້ມູນກັບ…</string>
+    <string name="keys_backup_setup_step3_please_make_copy">ກະລຸນາສ້າງສໍາເນົາ</string>
+    <string name="keys_backup_setup_override_stop">ຢຸດ</string>
+    <string name="keys_backup_setup_override_replace">ແທນທີ່</string>
+    <string name="keys_backup_setup_override_backup_prompt_description">ເບິ່ງຄືວ່າທ່ານມີການຕັ້ງຄ່າການສຳຮອງລະຫັດຈາກລະບົບອື່ນຢູ່ກ່ອນແລ້ວ. ທ່ານຕ້ອງການແທນທີ່ມັນກັບອັນທີ່ທ່ານກຳລັງສ້າງບໍ\?</string>
+    <string name="keys_backup_setup_override_backup_prompt_tile">ມີຂໍ້ມູນສຳຮອງຢູ່ໃນເຊີບເວີຂອງທ່ານຢູ່ກ່ອນແລ້ວ</string>
+    <string name="recovery_key_export_saved">ລະຫັດການກູ້ຂໍ້ມູນໄດ້ຖືກບັນທຶກໄວ້.</string>
+    <string name="keys_backup_setup_step3_save_button_title">ບັນທຶກເປັນໄຟລ໌</string>
+    <string name="keys_backup_setup_step3_share_recovery_file">ແບ່ງປັນ</string>
+    <string name="keys_backup_setup_step3_copy_button_title">ບັນທຶກລະຫັດການກູ້ຂໍ້ມູນ</string>
+    <string name="keys_backup_setup_step3_button_title_no_passphrase">ຂ້ອຍໄດ້ສ້າງສຳເນົາ</string>
+    <string name="keys_backup_setup_step3_button_title">ສຳເລັດແລ້ວ</string>
+    <string name="keys_backup_setup_step3_text_line2_no_passphrase">ຮັກສາກະແຈການກູ້ຂໍ້ມູນຂອງທ່ານໄວ້ບ່ອນໃດບ່ອນໜຶ່ງທີ່ປອດໄພຫຼາຍ ເຊັ່ນ: ຕົວຈັດການລະຫັດຜ່ານ (ຫຼືບ່ອນປອດໄພ)</string>
+    <string name="keys_backup_setup_step3_text_line2">ກະແຈການກູ້ຂໍ້ມູນຂອງທ່ານເປັນຕາໜ່າງຄວາມປອດໄພ - ທ່ານສາມາດໃຊ້ມັນເພື່ອກູ້ການເຂົ້າເຖິງຂໍ້ຄວາມທີ່ຖືກເຂົ້າລະຫັດຂອງທ່ານຄືນມາໄດ້ ຖ້າທ່ານລືມປະໂຫຍກລະຫັດຜ່ານຂອງທ່ານ.
+\nຮັກສາກະແຈການກູ້ຂໍ້ມູນຂອງທ່ານໄວ້ບ່ອນໃດບ່ອນໜຶ່ງທີ່ປອດໄພຫຼາຍ ເຊັ່ນ: ຕົວຈັດການລະຫັດຜ່ານ (ຫຼືບ່ອນປອດໄພ)</string>
+    <string name="keys_backup_setup_step3_text_line1">ກະແຈຂອງທ່ານກຳລັງຖືກສຳຮອງໄວ້.</string>
+    <string name="keys_backup_setup_step3_success_title">ຄວາມສໍາເລັດ !</string>
+    <string name="keys_backup_setup_step2_skip_button_title">(ຂັ້ນສູງ) ຕັ້ງຄ່າດ້ວຍລະຫັດການກູ້ຂໍ້ມູນ</string>
+    <string name="keys_backup_setup_step1_recovery_key_alternative">ຫຼື, ຮັບປະກັນການສຳຮອງຂໍ້ມູນຂອງທ່ານດ້ວຍກະແຈການກູ້ຂໍ້ມູນ, ບັນທຶກມັນໄວ້ບ່ອນໃດບ່ອນໜຶ່ງທີ່ປອດໄພ.</string>
+    <string name="keys_backup_setup_creating_backup">ການສ້າງສໍາຮອງຂໍ້ມູນ</string>
+    <string name="keys_backup_setup_step2_button_title">ກຳນົດລະຫັດຜ່ານ</string>
+    <string name="keys_backup_setup_step2_text_description">ພວກເຮົາຈະເກັບສຳເນົາລະຫັດທີ່ເຂົ້າລະຫັດໄວ້ຢູ່ໃນເຊີບເວີຂອງທ່ານ. ປົກປ້ອງການສຳຮອງຂໍ້ມູນຂອງທ່ານດ້ວຍປະໂຫຍກລະຫັດຜ່ານເພື່ອຮັກສາມັນໃຫ້ປອດໄພ.
+\n
+\nເພື່ອຄວາມປອດໄພສູງສຸດ, ອັນນີ້ຄວນຈະແຕກຕ່າງຈາກລະຫັດຜ່ານບັນຊີຂອງທ່ານ.</string>
+    <string name="keys_backup_setup_step2_text_title">ຮັບປະກັນການສຳຮອງຂໍ້ມູນຂອງທ່ານດ້ວຍລະຫັດຜ່ານ.</string>
+    <string name="keys_backup_setup_step1_manual_export">ສົ່ງອອກກະແຈດ້ວຍຕົນເອງ</string>
+    <string name="encryption_information_verify_device_warning">ຢືນຢັນໂດຍການປຽບທຽບສິ່ງຕໍ່ໄປນີ້ກັບການຕັ້ງຄ່າຜູ້ໃຊ້ໃນລະບົບອື່ນຂອງທ່ານ:</string>
+    <string name="encryption_information_verify">ຢືນຢັນ</string>
+    <string name="encryption_information_unknown_ip">ip ທີ່ບໍ່ຮູ້ຈັກ</string>
+    <string name="encryption_information_verified">ຢັ້ງຢືນແລ້ວ</string>
+    <string name="encryption_information_not_verified">ບໍ່ມີການຍືນຍັນ</string>
+    <plurals name="encryption_import_room_keys_success">
+        <item quantity="other">%1$d/%2$d ນຳເຂົ້າກະແຈສຳເລັດແລ້ວ.</item>
+    </plurals>
+    <string name="encryption_never_send_to_unverified_devices_summary">ຢ່າສົ່ງຂໍ້ຄວາມເຂົ້າລະຫັດໄປຫາລະບົບທີ່ບໍ່ໄດ້ຢືນຢັນຈາກລະບົບນີ້.</string>
+    <string name="encryption_never_send_to_unverified_devices_title">ເຂົ້າລະຫັດໄປຫາລະບົບທີ່ຢືນຢັນເທົ່ານັ້ນ</string>
+    <string name="encryption_import_import">ນໍາເຂົ້າ</string>
+    <string name="encryption_import_room_keys_summary">ນໍາເຂົ້າລະຫັດຈາກໄຟລ໌ໃນບ່ອນຈັດເກັບ</string>
+    <string name="encryption_import_room_keys">ນຳເຂົ້າກະແຈຫ້ອງ</string>
+    <string name="encryption_import_e2e_room_keys">ນຳເຂົ້າກະແຈຫ້ອງ E2E</string>
+    <string name="encryption_settings_manage_message_recovery_summary">ຈັດການການສໍາຮອງກະແຈ</string>
+    <string name="encryption_message_recovery">ການກູ້ຄືນຂໍ້ຄວາມທີ່ເຂົ້າລະຫັດໄວ້</string>
+    <string name="encryption_exported_successfully">ສົ່ງອອກກະແຈສຳເລັດແລ້ວ</string>
+    <string name="encryption_export_notice">ກະລຸນາສ້າງລະຫັດຜ່ານເພື່ອເຂົ້າລະຫັດທີ່ສົ່ງອອກ. ທ່ານຈະຕ້ອງໃສ່ລະຫັດຜ່ານດຽວກັນເພື່ອໃຫ້ສາມາດນໍາເຂົ້າລະຫັດໄດ້.</string>
+    <string name="encryption_export_export">ສົ່ງອອກ</string>
+    <string name="encryption_export_room_keys_summary">ສົ່ງອອກກະແຈໄປຍັງບ່ອນເກັບໄຟລ໌</string>
+    <string name="encryption_export_room_keys">ສົ່ງອອກກະແຈຫ້ອງ</string>
+    <string name="encryption_export_e2e_room_keys">ສົ່ງອອກກະແຈຫ້ອງ E2E</string>
+    <string name="encryption_information_device_key">ລະຫັດລະບົບ</string>
+    <string name="encryption_information_device_id">ID ລະບົບ</string>
+    <string name="encryption_information_device_name">ຊື່ສາທາລະນະ</string>
+    <string name="encryption_information_decryption_error">ການຖອດລະຫັດຜິດພາດ</string>
+    <string name="settings_theme">ຫົວຂໍ້</string>
+    <string name="room_settings_unset_main_address">ບໍ່ໄດ້ກຳນົດທີ່ຢູ່ຫຼັກ</string>
+    <string name="room_settings_set_main_address">ກຳນົດທີ່ຢູ່ຫຼັກ</string>
+    <string name="room_settings_labs_warning_message">ລັກສະນະການທົດລອງເຫຼົ່ານີ້ແມ່ນອາດໃຊ້ງານບໍ່ໄດ້. ໃຊ້ດ້ວຍຄວາມລະມັດລະວັງ.</string>
+    <string name="room_settings_labs_pref_title">ຫ້ອງທົດລອງ</string>
+    <string name="room_settings_room_version_title">ເວີຊັ້ນຫ້ອງ</string>
+    <string name="room_settings_room_internal_id">ID ພາຍໃນຫ້ອງນີ້</string>
+    <string name="room_settings_category_advanced_title">ຂັ້ນສູງ</string>
+    <plurals name="room_settings_banned_users_count">
+        <item quantity="other">%d ຜູ້ໃຊ້ທີ່ຖືກຫ້າມ</item>
+    </plurals>
+    <string name="room_settings_banned_users_title">ຫ້າມຜູ້ໃຊ້</string>
+    <string name="other_spaces_or_rooms_you_might_not_know">ພື້ນທີ່ ຫຼືຫ້ອງອື່ນໆທີ່ທ່ານອາດບໍ່ຮູ້</string>
+    <string name="space_you_know_that_contains_this_room">ພື້ນທີ່ທີ່ທູກຄົນຮູ້ວ່າມີຫ້ອງນີ້</string>
+    <string name="decide_who_can_find_and_join">ຕັດສິນໃຈວ່າໃຜສາມາດຊອກຫາ ແລະເຂົ້າຮ່ວມຫ້ອງນີ້ໄດ້.</string>
+    <string name="tap_to_edit_spaces">ແຕະເພື່ອແກ້ໄຂພຶ້ນທີ່</string>
+    <string name="select_spaces">ເລືອກພຶ້ນທີ່</string>
+    <string name="decide_which_spaces_can_access">ຕັດສິນໃຈວ່າພື້ນທີ່ໃດສາມາດເຂົ້າເຖິງຫ້ອງນີ້ໄດ້. ຖ້າພື້ນທີ່ຖືກເລືອກ ສະມາຊິກຈະສາມາດຊອກຫາ ແລະເຂົ້າຮ່ວມຊື່ຫ້ອງໄດ້.</string>
+    <string name="spaces_which_can_access">ພື້ນທີ່ທີ່ສາມາດເຂົ້າເຖິງໄດ້</string>
+    <string name="allow_space_member_to_find_and_access">ອະນຸຍາດໃຫ້ສະມາຊິກໃນພຶ້ນທີຊອກຫາ ແລະເຂົ້າເຖິງ.</string>
+    <string name="room_create_member_of_space_name_can_join">ສະມາຊິກຂອງພຶ້ນທີ່ %s ສາມາດຊອກຫາ, ເບິ່ງຕົວຢ່າງ ແລະເຂົ້າຮ່ວມໄດ້.</string>
+    <string name="room_settings_room_access_restricted_description">ທຸກຄົນຢູ່ໃນພື້ນທີ່ທີ່ມີຫ້ອງນີ້ສາມາດຊອກຫາ ແລະເຂົ້າຮ່ວມໄດ້. ມີແຕ່ຜູ້ເບິ່ງແຍງຫ້ອງນີ້ທີ່ສາມາດເພີ່ມໃສ່ພື້ນທີ່ໄດ້.</string>
+    <string name="room_settings_room_access_restricted_title">ສະມາຊິກຂອງພື້ນທີ່ເທົ່ານັ້ນ</string>
+    <string name="room_settings_space_access_public_description">ທຸກຄົນສາມາດຊອກຫາພື້ນທີ່ ແລະ ເຂົ້າຮ່ວມໄດ້</string>
+    <string name="room_settings_room_access_public_description">ທຸກຄົນສາມາດຊອກຫາຫ້ອງ ແລະ ເຂົ້າຮ່ວມໄດ້</string>
+    <string name="room_settings_room_access_public_title">ສາທາລະນະ</string>
+    <string name="room_settings_room_access_private_description">ສະເພາະຄົນທີ່ຖືກເຊີນສາມາດຊອກຫາ ແລະ ເຂົ້າຮ່ວມໄດ້</string>
+    <string name="room_settings_room_access_private_invite_only_title">ສ່ວນຕົວ (ເຊີນເທົ່ານັ້ນ)</string>
+    <string name="room_settings_room_access_private_title">ສ່ວນຕົວ</string>
+    <string name="room_settings_room_access_entry_unknown">ການຕັ້ງຄ່າການເຂົ້າເຖິງທີ່ບໍ່ຮູ້ຈັກ (%s)</string>
+    <string name="room_settings_room_access_entry_knock">ທຸກຄົນສາມາດເຄາະຫ້ອງໃດກໍ່ໄດ້, ສະມາຊິກສາມາດຍອມຮັບ ຫຼື ປະຕິເສດກໍ່ໄດ້</string>
+    <string name="room_settings_read_history_entry_members_only_joined">ສະມາຊິກເທົ່ານັ້ນ (ນັບຕັ້ງແຕ່ພວກເຂົາເຂົ້າຮ່ວມ)</string>
+    <string name="room_settings_read_history_entry_members_only_invited">ສະມາຊິກເທົ່ານັ້ນ (ນັບຕັ້ງແຕ່ພວກເຂົາຖືກເຊີນ)</string>
+    <string name="room_settings_read_history_entry_members_only_option_time_shared">ສະມາຊິກເທົ່ານັ້ນ (ຕັ້ງແຕ່ຈຸດທີ່ເລືອກຂອງທາງເລືອກນີ້)</string>
+    <string name="room_settings_read_history_entry_anyone">ຜູ້ໃດຜູ້ຫນຶ່ງ</string>
+    <string name="room_alias_publish_to_directory_error">ບໍ່ສາມາດດຶງຂໍ້ມູນການເບິ່ງເຫັນລາຍການຫ້ອງປະຈຸບັນໄດ້ (%1$s).</string>
+    <string name="room_alias_publish_to_directory">ເຜີຍແຜ່ຫ້ອງນີ້ຕໍ່ສາທາລະນະຢູ່ໃນລາຍການຫ້ອງຂອງ %1$s ບໍ\?</string>
+    <string name="room_alias_action_unpublish">ຍົກເລີກການເຜີຍແຜ່ທີ່ຢູ່ນີ້</string>
+    <string name="room_alias_action_publish">ເຜີຍແຜ່ທີ່ຢູ່ນີ້</string>
+    <string name="room_alias_local_address_add">ເພີ່ມທີ່ຢູ່ຂອງບ່ອນຈັດເກັບ</string>
+    <string name="room_alias_local_address_empty">ຫ້ອງນີ້ບໍ່ມີທີ່ຢູ່ບ່ອນຈັດເກັບ</string>
+    <string name="room_alias_local_address_subtitle">ກໍານົດທີ່ຢູ່ສໍາລັບຫ້ອງນີ້ເພື່ອໃຫ້ຜູ້ໃຊ້ສາມາດຊອກຫາຫ້ອງນີ້ຜ່ານ homeserver ຂອງທ່ານ (%1$s)</string>
+    <string name="room_alias_local_address_title">ທີ່ຢູ່ບ່ອນຈັດເກັບ</string>
+    <string name="room_alias_address_hint">ທີ່ຢູ່ທີ່ເຜີຍແຜ່ໃໝ່ (ເຊັ່ນ: #alias: server)</string>
+    <string name="room_alias_address_empty">ຍັງບໍ່ມີທີ່ຢູ່ທີ່ເຜີຍແຜ່ອື່ນເທື່ອ.</string>
+    <string name="room_alias_address_empty_can_add">ບໍ່ມີທີ່ຢູ່ທີ່ພິມເຜີຍແຜ່ອື່ນໆເທື່ອ, ເພີ່ມທີ່ຢູ່ຂ້າງລຸ່ມນີ້.</string>
+    <string name="room_alias_delete_confirmation">ລຶບທີ່ຢູ່ \"%1$s\" ບໍ\?</string>
+    <string name="room_alias_unpublish_confirmation">ຍົກເລີກການເຜີຍແຜ່ທີ່ຢູ່ \"%1$s\" ບໍ\?</string>
+    <string name="room_alias_published_alias_add_manually_submit">ເຜີຍແຜ່</string>
+    <string name="room_alias_published_alias_add_manually">ເຜີຍແຜ່ທີ່ຢູ່ໃໝ່ດ້ວຍຕົນເອງ</string>
+    <string name="room_alias_published_other">ທີ່ຢູ່ອື່ນໆທີ່ເຜີຍແຜ່:</string>
+    <string name="room_alias_published_alias_main">ນີ້ແມ່ນທີ່ຢູ່ຫຼັກ</string>
+    <string name="room_alias_published_alias_subtitle">ທີ່ຢູ່ທີ່ເຜີຍແຜ່ສາມາດນໍາໃຊ້ໂດຍຜູ້ໃດຜູ້ຫນຶ່ງໃນເຊີບເວີການເຂົ້າຮ່ວມຫ້ອງຂອງທ່ານ. ເພື່ອເຜີຍແຜ່ທີ່ຢູ່, ຈໍາເປັນຕ້ອງຕັ້ງເປັນທີ່ຢູ່ຊ່ອງເກັບກ່ອນ.</string>
+    <string name="room_alias_published_alias_title">ທີ່ຢູ່ທີ່ເຜີຍແຜ່</string>
+    <string name="space_settings_alias_subtitle">ເບິ່ງ ແລະ ຈັດການທີ່ຢູ່ຂອງພື້ນທີ່ນີ້.</string>
+    <string name="space_settings_alias_title">ທີ່ຢູ່ຂອງພື້ນທີ່</string>
+    <string name="room_settings_alias_subtitle">ເບິ່ງ ແລະ ຈັດການທີ່ຢູ່ຂອງຫ້ອງນີ້, ແລະການເບິ່ງເຫັນຢູ່ໃນລາຍຊື່ຫ້ອງ.</string>
+    <string name="room_settings_alias_title">ທີ່ຢູ່ຫ້ອງ</string>
+    <string name="room_settings_guest_access_title">ອະນຸຍາດໃຫ້ແຂກເຂົ້າຮ່ວມ</string>
+    <string name="room_settings_space_access_title">ການເຂົ້າເຖິງພື້ນທີ່</string>
+    <string name="room_settings_room_access_title">ການເຂົ້າເຖິງຫ້ອງ</string>
+    <string name="room_settings_access_rules_pref_dialog_title">ໃຜສາມາດເຂົ້າເຖິງໄດ້ແນ່\?</string>
+    <string name="room_settings_room_read_history_dialog_subtitle">ການປ່ຽນແປງຜູ້ທີ່ອ່ານປະຫວັດໄດ້ຈະມີຜົນກັບຂໍ້ຄວາມໃນອະນາຄົດຢູ່ໃນຫ້ອງນີ້ເທົ່ານັ້ນ. ການເບິ່ງເຫັນປະຫວັດທີ່ມີຢູ່ແລ້ວຈະບໍ່ປ່ຽນແປງ.</string>
+    <string name="room_settings_room_read_history_rules_pref_dialog_title">ຜູ້ທີ່ສາມາດອ່ານປະຫວັດໄດ້\?</string>
+    <string name="room_settings_room_read_history_rules_pref_title">ການອ່ານປະຫວັດຫ້ອງ</string>
+    <string name="room_settings_room_notifications_account_settings">ຕັ້ງຄ່າບັນຊີ</string>
+    <string name="room_settings_room_notifications_manage_notifications">ທ່ານສາມາດຈັດການການແຈ້ງເຕືອນໃນ %1$s.</string>
+    <string name="room_settings_room_notifications_encryption_notice">ກະລຸນາສັງເກດວ່າການກ່າວເຖິງ &amp; ການແຈ້ງເຕືອນຄໍາສໍາຄັນບໍ່ສາມາດໃຊ້ໄດ້ໃນຫ້ອງທີ່ເຂົ້າລະຫັດໃນໂທລະສັບມືຖື.</string>
+    <string name="room_settings_room_notifications_notify_me">ຈ້ງໃຫ້ຂ້າພະເຈົ້າຊາບເພື່ອ</string>
+    <string name="room_settings_topic">ຫົວຂໍ້</string>
+    <string name="settings_presence_user_always_appears_offline_summary">ຖ້າເປີດໃຊ້ງານແລ້ວ, ທ່ານຈະສະເເດງສະຖານະແບບອອບໄລນ໌ຕໍ່ກັບຜູ້ໃຊ້ອື່ນສະເໝີ, ເຖິງແມ່ນວ່າຈະໃຊ້ແອັບພລິເຄຊັນກໍຕາມ.</string>
+    <string name="settings_presence_user_always_appears_offline">ໂໝດອອບໄລນ໌</string>
+    <string name="settings_presence">ປະກົດຕົວ</string>
+    <string name="media_saving_period_forever">ຕະຫຼອດໄປ</string>
+    <string name="media_saving_period_1_month">1 ເດືອນ</string>
+    <string name="media_saving_period_1_week">1 ອາທິດ</string>
+    <string name="media_saving_period_3_days">3 ມື້</string>
+    <string name="settings_flair" tools:ignore="MissingTranslation">ໄຫວພິບ</string>
+    <string name="settings_play_shutter_sound">ຫຼິ້ນສຽງ shutter</string>
+    <string name="media_source_choose">ເລືອກ</string>
+    <string name="settings_default_media_source">ແຫຼ່ງສື່</string>
+    <string name="compression_opt_list_choose">ເລືອກ</string>
+    <string name="settings_default_compression">ການບີບອັດ</string>
+    <string name="settings_media">ສື່ມວນຊົນ</string>
+    <string name="settings_select_country">ເລືອກປະເທດ</string>
+    <string name="settings_emails_and_phone_numbers_summary">ຈັດການອີເມວ ແລະເບີໂທລະສັບທີ່ເຊື່ອມຕໍ່ກັບບັນຊີ Matrix ຂອງທ່ານ</string>
+    <string name="settings_emails_and_phone_numbers_title">ອີເມວ ແລະເບີໂທລະສັບ</string>
+    <string name="settings_unignore_user">ສະແດງຂໍ້ຄວາມທັງໝົດຈາກ %s ບໍ\?
+\n
+\nກະລຸນາຮັບຊາບວ່າຄຳສັ່ງນີ້ຈະປິດເປີດແອັບຄືນໃໝ່ ແລະ ມັນອາດຈະໃຊ້ເວລາຄາວໜຶ່ງ.</string>
+    <string name="settings_password_updated">ລະຫັດຜ່ານຂອງທ່ານໄດ້ຮັບການປັບປຸງ</string>
+    <string name="settings_fail_to_update_password_invalid_current_password">ລະຫັດຜ່ານບໍ່ຖືກຕ້ອງ</string>
+    <string name="settings_fail_to_update_password">ອັບເດດລະຫັດຜ່ານບໍ່ສຳເລັດ</string>
+    <string name="settings_new_password">ລະຫັດຜ່ານໃໝ່</string>
+    <string name="settings_old_password">ລະຫັດປັດຈຸບັນ</string>
+    <string name="settings_change_password">ປ່ຽນລະຫັດຜ່ານ</string>
+    <string name="settings_password">ລະຫັດຜ່ານ</string>
+    <string name="account_phone_number_already_used_error">ເບີໂທລະສັບນີ້ຖືກໃຊ້ແລ້ວ.</string>
+    <string name="account_email_already_used_error">ທີ່ຢູ່ອີເມວນີ້ຖືກໃຊ້ແລ້ວ.</string>
+    <string name="account_email_validation_message">ກະລຸນາກວດເບິ່ງອີເມວຂອງທ່ານແລະກົດໃສ່ການເຊື່ອມຕໍ່. ເມື່ອສິ່ງນີ້ສຳເລັດແລ້ວ, ກົດສືບຕໍ່.</string>
+    <string name="settings_select_language">ເລືອກພາສາ</string>
+    <string name="settings_interface_language">ພາສາ</string>
+    <string name="settings_user_interface">ການໂຕ້ຕອບຜູ້ໃຊ້</string>
+    <string name="disabled_integration_dialog_content">ເປີດໃຊ້ \'ການອະນຸຍາດການເຊື່ອມໂຍງ\' ໃນການຕັ້ງຄ່າເພື່ອເຮັດສິ່ງນີ້.</string>
+    <string name="disabled_integration_dialog_title">ການເຊື່ອມໂຍງຖືກປິດໃຊ້ງານ</string>
+    <string name="legals_no_policy_provided">ເຊີບເວີນີ້ບໍ່ມີນະໂຍບາຍໃດໆ.</string>
+    <string name="legals_third_party_notices">ຫ້ອງສະຫມຸດພາກສ່ວນທີສາມ</string>
+    <string name="legals_identity_server_title">ນະໂຍບາຍເຊີບເວີຂອງທ່ານ</string>
+    <string name="legals_home_server_title">ນະໂຍບາຍ homeserver ຂອງທ່ານ</string>
+    <string name="legals_application_title">ນະໂຍບາຍ ${app_name}</string>
+    <string name="settings_integration_manager">ຜູ້ຈັດການການເຊື່ອມໂຍງ</string>
+    <string name="settings_integration_allow">ອະນຸຍາດໃຫ້ການເຊື່ອມໂຍງ</string>
+    <string name="settings_identity_server">ຂໍ້ມູມເຊີບເວີ</string>
+    <string name="settings_home_server">Homeserver</string>
+    <string name="settings_logged_in">ເຂົ້າສູ່ລະບົບເປັນ</string>
+    <string name="devices_delete_dialog_title">ການຢືນຢັນ</string>
+    <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
+    <string name="devices_details_last_seen_title">ເຫັນຄັ້ງສຸດທ້າຍ</string>
+    <string name="devices_details_device_name">ອັບເດດຊື່ສາທາລະນະ</string>
+    <string name="devices_details_name_title">ຊື່ສາທາລະນະ</string>
+    <string name="devices_details_id_title">ID</string>
+    <string name="analytics_opt_in_list_item_3">ທ່ານສາມາດປິດສິ່ງນີ້ໄດ້ທຸກເວລາໃນການຕັ້ງຄ່າ</string>
+    <string name="settings_show_read_receipts_summary">ກົດໃສ່ໃບຕອບຮັບເພື່ອອ່ານລາຍລະອຽດ.</string>
+    <string name="settings_show_read_receipts">ສະແດງໃບຕອບຮັບການອ່ານ</string>
+    <string name="settings_12_24_timestamps">ສະແດງເວລາໃນຮູບແບບ 12 ຊົ່ວໂມງ</string>
+    <string name="settings_always_show_timestamps">ສະແດງເວລາຂອງຂໍ້ຄວາມທັງໝົດ</string>
+    <string name="settings_send_markdown_summary">ຈັດຮູບແບບຂໍ້ຄວາມໂດຍໃຊ້ syntax markdown ກ່ອນທີ່ພວກມັນຈະຖືກສົ່ງໄປ. ອັນນີ້ອະນຸຍາດໃຫ້ຈັດຮູບແບບພິເສດເຊັ່ນ: ການໃຊ້ເຄື່ອງໝາຍດາວເພື່ອສະແດງຂໍ້ຄວາມຕົວອຽງ.</string>
+    <string name="settings_send_markdown">ການຈັດຮູບແບບ Markdown</string>
+    <string name="settings_send_typing_notifs_summary">ໃຫ້ຜູ້ໃຊ້ອື່ນຮູ້ວ່າທ່ານກຳລັງພິມຢູ່.</string>
+    <string name="settings_send_typing_notifs">ສົ່ງການແຈ້ງເຕືອນໃນການພິມ</string>
+    <string name="settings_inline_url_preview_summary">ເບິ່ງຕົວຢ່າງລິ້ງພາຍໃນການສົນທະນາເມື່ອ homeserver ຂອງທ່ານຮອງຮັບຄຸນສົມບັດນີ້.</string>
+    <string name="settings_inline_url_preview">ຕົວຢ່າງ URL ແບບInline</string>
+    <string name="settings_pin_unread_messages">ປັກໝຸດຫ້ອງດ້ວຍຂໍ້ຄວາມທີ່ຍັງບໍ່ໄດ້ອ່ານ</string>
+    <string name="settings_pin_missed_notifications">ປັກໝຸດຫ້ອງດ້ວຍການແຈ້ງເຕືອນທີ່ພາດ</string>
+    <string name="settings_home_display">ຈໍສະແດງຜົນຫນ້າທໍາອິດ</string>
+    <string name="settings_contacts_phonebook_country">ປື້ມໂທລະສັບ</string>
+    <string name="settings_contacts_app_permission">ການອະນຸຍາດຕິດຕໍ່</string>
+    <string name="settings_contact">ຕິດຕໍ່ພື້ນທີ່ຈັດເກັບ</string>
+    <string name="settings_notifications_targets">ເປົ້າໝາຍການແຈ້ງເຕືອນ</string>
+    <string name="settings_cryptography_manage_keys">ການຈັດການເຂົ້າລະຫັດລັບ</string>
+    <string name="settings_cryptography">ການເຂົ້າລະຫັດລັບ</string>
+    <string name="settings_integrations_summary">ໃຊ້ຕົວຈັດການການເຊື່ອມໂຍງເພື່ອຈັດການ bots, bridges, widget ແລະຊຸດສະຕິກເກີ.
+\nຜູ້ຈັດການການເຊື່ອມໂຍງຂໍ້ມູນການຕັ້ງຄ່າ, ແລະສາມາດດັດແປງ widget, ສົ່ງການເຊື້ອເຊີນຫ້ອງແລະກໍານົດລະດັບພະລັງງານໃນນາມຂອງທ່ານ.</string>
+    <string name="settings_integrations">ການເຊື່ອມໂຢງ</string>
+    <string name="settings_troubleshoot_test_push_loop_success">ແອັບພລິເຄຊັນກຳລັງໄດ້ຮັບ PUSH</string>
+    <string name="settings_troubleshoot_test_push_loop_waiting_for_push">ຄໍາຮ້ອງສະຫມັກແມ່ນລໍຖ້າສໍາລັບການຊຸກຍູ້</string>
+    <string name="settings_troubleshoot_test_push_loop_title">ທົດສອບ Push</string>
+    <string name="settings_troubleshoot_test_token_registration_failed">ການລົງທະບຽນ FCM token ກັບ homeserver ບໍ່ສຳເລັດ:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_token_registration_success">FCM token ສຳເລັດການລົງທະບຽນກັບ homeserver.</string>
+    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nຂໍ້ຜິດພາດນີ້ບໍ່ສາມາດຄວບຄຸມໄດ້ ${app_name}. ມັນສາມາດເກີດຂຶ້ນຍ້ອນເຫດຜົນຫຼາຍຢ່າງ. ບາງທີມັນອາດຈະໃຊ້ໄດ້ຖ້າຫາກທ່ານລອງໃຫມ່ໃນພາຍຫຼັງ, ທ່ານຍັງສາມາດກວດເບິ່ງວ່າບໍລິການ Google Play ບໍ່ໄດ້ຖືກຈໍາກັດໃນການນໍາໃຊ້ຂໍ້ມູນໃນການຕັ້ງຄ່າລະບົບ, ຫຼື ວ່າໂມງອຸປະກອນຂອງທ່ານແມ່ນຖືກຕ້ອງ, ຫຼືສາມາດເກີດຂື້ນໃນ ROM ແບບກໍານົດເອງ.</string>
+    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nຂໍ້ຜິດພາດນີ້ບໍ່ສາມາດຄວບຄຸມໄດ້ ${app_name} ແລະອີງຕາມ Google, ຂໍ້ຜິດພາດນີ້ຊີ້ໃຫ້ເຫັນວ່າອຸປະກອນມີຫຼາຍເເອັບທີ່ລົງທະບຽນກັບ FCM ຫຼາຍເກີນໄປ. ຂໍ້ຜິດພາດເກີດຂື້ນພຽງແຕ່ໃນກໍລະນີທີ່ມີແອັບຈພນວນຫຼາຍ, ດັ່ງນັ້ນຈຶ່ງບໍ່ສົ່ງຜົນກະທົບຕໍ່ຜູ້ໃຊ້ໂດຍສະເລ່ຍ.</string>
+    <string name="ssl_expected_existing_expl">ໃບຢັ້ງຢືນໄດ້ປ່ຽນຈາກອັນທີ່ເຊື່ອຖືກ່ອນໜ້ານີ້ ມາເປັນອັນທີ່ບໍ່ໜ້າເຊື່ອຖືໄດ້. ເຊີບເວີອາດຈະໄດ້ຕໍ່ອາຍຸໃບຢັ້ງຢືນແລ້ວ. ຕິດຕໍ່ຜູ້ເບິ່ງແຍງເໍີບເວີສໍາລັບລາຍນິ້ວທີ່ຕ້ອງການ.</string>
+    <string name="settings_category_room_directory">ລາຍການຫ້ອງ</string>
+    <string name="dialog_title_warning">ຄຳເຕືອນ</string>
+    <string name="settings_troubleshoot_test_push_loop_failed">ຮັບການຊຸກຍູ້ບໍ່ສຳເລັດ. ການແກ້ໄຂອາດຈະເປັນການຕິດຕັ້ງແອັບພລິເຄຊັນໃຫມ່.</string>
+    <string name="settings_advanced">ຂັ້ນສູງ</string>
+    <string name="settings_other">ອື່ນໆ</string>
+    <string name="settings_ignored_users">ຜູ້ໃຊ້ບໍ່ສົນໃຈ</string>
+    <string name="settings_notifications">ການແຈ້ງເຕືອນ</string>
+    <string name="settings_user_settings">ການຕັ້ງຄ່າຜູ້ໃຊ້</string>
+    <string name="settings_clear_media_cache">ລ້າງcacheມີເດຍ</string>
+    <string name="settings_clear_cache">ລ້າງ cache</string>
+    <string name="settings_keep_media">ຮັກສາສື່</string>
+    <string name="settings_privacy_policy">ນະໂຍບາຍຄວາມເປັນສ່ວນຕົວ</string>
+    <string name="settings_copyright">ລິຂະສິດ</string>
+    <string name="settings_third_party_notices">ແຈ້ງການພາກສ່ວນທີສາມ</string>
+    <string name="settings_app_term_conditions">ຂໍ້ຕົກລົງ &amp; ເງື່ອນໄຂ</string>
+    <string name="settings_olm_version">ເວີຊັ້ນ olm</string>
+    <string name="settings_version">ເວີຊັ້ນ</string>
+    <plurals name="seconds">
+        <item quantity="other">%d ວິນາທີ</item>
+    </plurals>
+    <string name="report_content_spam">ມັນເປັນ spam</string>
+    <string name="uploads_files_no_result">ບໍ່ມີໄຟລ໌ຢູ່ໃນຫ້ອງນີ້</string>
+    <string name="uploads_files_subtitle">%1$s ທີ່ %2$s</string>
+    <string name="uploads_files_title">ໄຟລ໌</string>
+    <string name="uploads_media_no_result">ບໍ່ມີສື່ຢູ່ໃນຫ້ອງນີ້</string>
+    <string name="uploads_media_title">ສື່ມວນຊົນ</string>
+    <string name="attachment_viewer_item_x_of_y">%1$d ຂອງ%2$d</string>
+    <string name="error_handling_incoming_share">ບໍ່ສາມາດຈັດການຂໍ້ມູນການແບ່ງປັນໄດ້</string>
+    <string name="rotate_and_crop_screen_title">ໝູນ ແລະຕັດ</string>
+    <string name="attachment_type_location">ສະຖານທີ່</string>
+    <string name="attachment_type_poll">ການສໍາຫຼວດ</string>
+    <string name="attachment_type_sticker">ສະຕິກເກີ</string>
+    <string name="attachment_type_gallery">ຄັງຮູບ</string>
+    <string name="attachment_type_camera">ກ້ອງຖ່າຍຮູບ</string>
+    <string name="attachment_type_contact">ຕິດຕໍ່</string>
+    <string name="attachment_type_file">ໄຟລ໌</string>
+    <string name="attachment_type_dialog_title">ເພີ່ມຮູບພາບຈາກ</string>
+    <string name="error_attachment">ເກີດຄວາມຜິດພາດຂຶ້ນໃນຂະນະທີ່ກຳລັງດຶງໄຟລ໌ແນບມາ.</string>
+    <string name="error_file_too_big_simple">ໄຟລ໌ໃຫຍ່ເກີນທີ່ຈະອັບໂຫລດ.</string>
+    <plurals name="fallback_users_read">
+        <item quantity="other">%d ຜູ້ໃຊ້ອ່ານແລ້ວ</item>
+    </plurals>
+    <string name="one_user_read">%s ອ່ານແລ້ວ</string>
+    <string name="two_users_read">%1$s ແລະ %2$s ອ່ານແລ້ວ</string>
+    <string name="three_users_read">%1$s, %2$s ແລະ %3$s ອ່ານແລ້ວ</string>
+    <plurals name="two_and_some_others_read">
+        <item quantity="other">%1$s, %2$s ແລະ %3$d ຜູ້ອື່ນໆອ່ານ</item>
+    </plurals>
+    <string name="a11y_jump_to_bottom">ໄປທີ່ດ້ານລຸ່ມ</string>
+    <string name="a11y_close_keys_backup_banner">ປິດປ້າຍການກສຳຮອງຂໍ້ມູນກະເເຈ</string>
+    <string name="a11y_create_room">ສ້າງຫ້ອງໃຫມ່</string>
+    <string name="a11y_create_direct_message">ສ້າງການສົນທະນາໃຫມ່ໂດຍກົງ</string>
+    <string name="a11y_create_menu_close">ປິດເມນູສ້າງຫ້ອງ…</string>
+    <string name="a11y_create_menu_open">ເປີດເມນູສ້າງຫ້ອງ</string>
+    <string name="a11y_open_drawer">ເປີດຕົວນໍາທາງ</string>
+    <string name="send_attachment">ສົ່ງໄຟລ໌ແນບ</string>
+    <string name="error_network_timeout">ເບິ່ງຄືວ່າເຊີບເວີໃຊ້ເວລາດົນເກີນໄປໃນການຕອບສະໜອງ, ສິ່ງນີ້ອາດເກີດຈາກການສັນຍານການເຊື່ອມຕໍ່ບໍ່ສະຖຽນ ຫຼື ຂໍ້ຜິດພາດກັບເຊີບເວີ. ກະລຸນາລອງອີກຄັ້ງໃນອີກໄລຍະໜຶ່ງ.</string>
+    <string name="error_terms_not_accepted">ກະລຸນາລອງໃໝ່ອີກຄັ້ງເມື່ອທ່ານຍອມຮັບຂໍ້ກຳນົດ ແລະເງື່ອນໄຂຂອງ homeserver ຂອງທ່ານ.</string>
+    <string name="labs_allow_extended_logging_summary">ບັນທຶກລະອຽດ ຈະຊ່ວຍໃຫ້ນັກພັດທະນາສະຫນອງບັນທຶກເພີ່ມເຕີມເມື່ອທ່ານສົ່ງ RageShake. ເຖິງແມ່ນວ່າໃນເວລາທີ່ເປີດໃຊ້, ແອັບພລິເຄຊັນຈະບໍ່ບັນທຶກເນື້ອຫາຂໍ້ຄວາມ ຫຼື ຂໍ້ມູນສ່ວນຕົວອື່ນໆກໍ່ຕາມ.</string>
+    <string name="labs_allow_extended_logging">ເປີດໃຊ້ບັນທຶກລາຍລະອຽດ.</string>
+    <string name="settings_agree_to_terms">ເຫັນດີກັບເງື່ອນໄຂການໃຫ້ບໍລິການຂອງ ເຊີບເວີ(%s) ເພື່ອອະນຸຍາດໃຫ້ຕົວທ່ານສາມາດຄົ້ນຫາໄດ້ໂດຍທີ່ຢູ່ອີເມວ ຫຼື ເບີໂທລະສັບ.</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">ຕອນນີ້ທ່ານກຳລັງແບ່ງປັນທີ່ຢູ່ອີເມວ ຫຼື ເບີໂທລະສັບໃນເຊີບເວີ %1$s. ທ່ານຈະຕ້ອງເຊື່ອມຕໍ່ຄືນໃໝ່ກັບ %2$s ເພື່ອຢຸດການແບ່ງປັນອີເມວ ຫຼື ເບີໂທລະສັບ.</string>
+    <string name="settings_text_message_sent_wrong_code">ການຢືນຢັນລະຫັດບໍ່ຖືກຕ້ອງ.</string>
+    <string name="settings_text_message_sent_hint">ລະຫັດ</string>
+    <string name="settings_text_message_sent">ຂໍ້ຄວາມຖືກສົ່ງໄປຫາ %s ແລ້ວ. ກະລຸນາໃສ່ລະຫັດຢືນຢັນ.</string>
+    <string name="settings_discovery_no_terms">ເຊີບເວີທີ່ທ່ານເລືອກບໍ່ມີເງື່ອນໄຂການບໍລິການໃດໆ. ດຳເນີນການຕໍ່ຫາກທ່ານໄວ້ວາງໃຈເຈົ້າຂອງການບໍລິການ</string>
+    <string name="settings_discovery_no_terms_title">ເຊີບເວີບໍ່ມີເງື່ອນໄຂໃນການໃຫ້ບໍລິການ</string>
+    <string name="settings_discovery_please_enter_server">ກະລຸນາໃສ່ url ເຊີບເວີ</string>
+    <string name="settings_discovery_bad_identity_server">ບໍ່ສາມາດເຊື່ອມຕໍ່ກັບເຊີບເວີໄດ້</string>
+    <string name="settings_discovery_enter_identity_server">ໃສ່ URL ເຊີບເວີ</string>
+    <string name="identity_server_consent_dialog_content_question">ທ່ານຕົກລົງເຫັນດີທີ່ຈະສົ່ງຂໍ້ມູນນີ້ບໍ\?</string>
+    <string name="identity_server_consent_dialog_content_3">ເພື່ອຄົ້ນຫາຜູ້ຕິດຕໍ່ທີ່ມີຢູ່ແລ້ວ, ທ່ານຈໍາເປັນຕ້ອງສົ່ງຂໍ້ມູນການຕິດຕໍ່ (ອີເມວ ແລະ ເບີໂທລະສັບ) ໄປຫາເຊີບເວີຂອງທ່ານ. ພວກເຮົາຄັດ ຂໍ້ມູນຂອງທ່ານກ່ອນທີ່ຈະສົ່ງເພື່ອຄວາມເປັນສ່ວນຕົວ.</string>
+    <string name="identity_server_consent_dialog_title_2">ສົ່ງອີເມວ ແລະເບີໂທລະສັບໄປຫາ %s</string>
+    <string name="settings_discovery_consent_action_give_consent">ໃຫ້ການຍິນຍອມ</string>
+    <string name="settings_discovery_consent_action_revoke">ຍົກເລີກການຍິນຍອມຂອງຂ້ອຍ</string>
+    <string name="settings_discovery_consent_notice_off_2">ລາຍຊື່ຜູ້ຕິດຕໍ່ຂອງທ່ານເປັນສ່ວນຕົວ. ເພື່ອຄົ້ນຫາຜູ້ໃຊ້ໃນລາຍຊື່ຜູ້ຕິດຕໍ່ຂອງທ່ານ, ພວກເຮົາຕ້ອງການໄດ້ຮັບອະນຸຍາດຈາກທ່ານເພື່ອສົ່ງຂໍ້ມູນການຕິດຕໍ່ໄປຫາເຊີບຂອງທ່ານ.</string>
+    <string name="settings_discovery_consent_notice_on">ທ່ານໄດ້ໃຫ້ການຍິນຍອມທີ່ຈະສົ່ງອີເມວຂອງທ່ານ ແລະ ເບີໂທລະສັບໄປຫາເຊີບເວີນີ້ເພື່ອຄົ້ນຫາຜູ້ໃຊ້ອື່ນໆຈາກຜູ້ຕິດຕໍ່ຂອງທ່ານ.</string>
+    <string name="settings_discovery_consent_title">ສົ່ງອີເມວ ແລະ ເບີໂທລະສັບ</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">ພວກເຮົາໄດ້ສົ່ງອີເມວການຢືນຢັນໃຫ້ທ່ານໄປຫາ %s, ກະລຸນາກວດສອບອີເມວຂອງທ່ານກາອນ ແລະ ກົດໃສ່ການເຊື່ອມຕໍ່ການຢືນຢັນ</string>
+    <string name="settings_discovery_confirm_mail">ພວກເຮົາໄດ້ສົ່ງອີເມວຢືນຢັນໃຫ້ທ່ານຫາ %s, ກວດສອບອີເມວຂອງທ່ານ ແລະ ກົດໃສ່ການເຊື່ອມຕໍ່ການຢືນຢັນ</string>
+    <string name="settings_discovery_msisdn_title">ສາມາດຄົ້ນພົບເບີໂທລະສັບໄດ້</string>
+    <string name="settings_discovery_disconnect_identity_server_info">ການຕັດການເຊື່ອມຕໍ່ຈາກເຊີບເວີຂອງທ່ານຈະເຮັດໃຫ້ຜູ້ໃຊ້ອື່ນຄນຫາທ່ານໄດ້ ແລະ ທ່ານຈະບໍ່ສາມາດເຊີນຄົນອື່ນຜ່ານທາງອີເມລ໌ ຫຼື ໂທລະສັບໄດ້.</string>
+    <string name="settings_discovery_no_msisdn">ຕົວເລືອກການຄົ້ນພົບຈະປາກົດຂຶ້ນເມື່ອທ່ານໄດ້ເພີ່ມເບີໂທລະສັບ.</string>
+    <string name="settings_discovery_no_mails">ຕົວເລືອກການຄົ້ນພົບຈະປາກົດຂຶ້ນເມື່ອທ່ານໄດ້ເພີ່ມອີເມວ.</string>
+    <string name="settings_discovery_emails_title">ສາມາດຄົ້ນພົບທີ່ຢູ່ອີເມວໄດ້</string>
+    <string name="settings_discovery_identity_server_info_none">ໃນປັດຈຸບັນທ່ານບໍ່ໄດ້ໃຊ້ເຊີບເວີ. ເພື່ອຄົ້ນຫາແລະສາມາດຄົ້ນພົບໄດ້ໂດຍຜູ້ຕິດຕໍ່ທີ່ມີຢູ່ແລ້ວ, ກໍານົດຄ່າຂ້າງລຸ່ມນີ້.</string>
+    <string name="settings_discovery_identity_server_info">ຕອນນີ້ທ່ານກຳລັງໃຊ້ %1$s ເພື່ອຄົ້ນຫາ ແລະສາມາດຄົ້ນພົບໄດ້ໂດຍຜູ້ຕິດຕໍ່ທີ່ມີຢູ່ແລ້ວທີ່ທ່ານຮູ້ຈັກ.</string>
+    <string name="settings_discovery_no_policy_provided">ບໍ່ມີນະໂຍບາຍສະໜອງໃຫ້ໂດຍເຊີບເວີ</string>
+    <string name="settings_discovery_hide_identity_server_policy_title">ເຊື່ອງນະໂຍບາຍເຊີບເວີ</string>
+    <string name="settings_discovery_show_identity_server_policy_title">ສະແດງນະໂຍບາຍເຊີບ</string>
+    <string name="change_identity_server">ປ່ຽນເຊີບເວີ</string>
+    <string name="open_discovery_settings">ເປີດການຕັ້ງຄ່າ ການຄົ້ນພົບ</string>
+    <string name="add_identity_server">ຕັ້ງຄ່າເຊີບເວີ</string>
+    <string name="disconnect_identity_server">ຕັດການເຊື່ອມຕໍ່ເຊີບເວີ</string>
+    <string name="identity_server">ຂໍ້ມູນເຊີບເວີ</string>
+    <string name="terms_description_for_integration_manager">ໃຊ້ Bots, bridges,widgets ແລະຊຸດສະຕິກເກີ</string>
+    <string name="terms_description_for_identity_server">ໃຫ້ຜູ້ອື່ນສາມາດຄົ້ນຫາໄດ້</string>
+    <string name="terms_of_service">ເງື່ອນໄຂການໃຫ້ບໍລິການ</string>
+    <string name="message_view_edit_history">ເບິ່ງປະຫວັດການແກ້ໄຂ</string>
+    <string name="direct_room_user_list_suggestions_title">ຄຳແນະນຳ</string>
+    <string name="direct_room_user_list_known_title">ຜູ້ໃຊ້ທີ່ຮູ້ຈັກ</string>
+    <string name="creating_direct_room">ກຳລັງສ້າງຫ້ອງ…</string>
+    <string name="qr_code">ລະຫັດ QR</string>
+    <string name="add_by_qr_code">ເພີ່ມດ້ວຍລະຫັດ QR</string>
+    <string name="link_copied_to_clipboard">ສຳເນົາລິ້ງໃສ່ຄລິບບອດແລ້ວ</string>
+    <string name="labs_show_unread_notifications_as_tab">ເພີ່ມແຖບສະເພາະສໍາລັບການແຈ້ງເຕືອນທີ່ຍັງບໍ່ໄດ້ອ່ານໃນຫນ້າຈໍຫຼັກ.</string>
+    <string name="labs_swipe_to_reply_in_timeline">ເປີດໃຊ້ງານການປັດເພື່ອຕອບກັບໃນທາມລາຍ</string>
+    <string name="search_hint_room_name">ຊອກຫາຊື່</string>
+    <string name="user_directory_search_hint_2">ຄົ້ນຫາດ້ວຍຊື່, ID ຫຼື mail</string>
+    <string name="room_directory_search_hint">ຊື່ ຫຼື ID (#example:matrix.org)</string>
+    <string name="room_filtering_footer_open_room_directory">ເບິ່ງລາຍການຫ້ອງ</string>
+    <string name="room_filtering_footer_create_new_direct_message">ສົ່ງຂໍ້ຄວາມໃໝ່ໂດຍກົງ</string>
+    <string name="room_filtering_footer_create_new_room">ສ້າງຫ້ອງໃຫມ່</string>
+    <string name="room_filtering_footer_title">ບໍ່ສາມາດຊອກຫາສິ່ງທີ່ທ່ານກໍາລັງຊອກຫາ\?</string>
+    <string name="room_filtering_filter_hint">ກັ່ນຕອງການສົນທະນາ…</string>
+    <string name="settings_set_sync_delay">ທ່ວງເວລາລະຫວ່າງSync</string>
+    <string name="settings_set_sync_timeout">ໝົດເວລາການຮ້ອງຂໍການຊິງຄ໌</string>
+    <string name="settings_start_on_boot">ເລີ່ມຕົ້ນໃນການboot</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">ທ່ານຈະບໍ່ໄດ້ຮັບການແຈ້ງເຕືອນກ່ຽວກັບຂໍ້ຄວາມທີ່ເຂົ້າມາເມື່ອແອັບຯຢູ່ໃນພື້ນຫຼັງ.</string>
+    <string name="settings_background_fdroid_sync_mode_disabled">ບໍ່ມີການຊິງຄ໌ພື້ນຫຼັງ</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">${app_name} ຈະຊິງຄ໌ໃນພື້ນຫຼັງເປັນໄລຍະໆຕາມເວລາທີ່ຊັດເຈນ (ກຳນົດໄດ້).
+\nນີ້ຈະສົ່ງຜົນກະທົບຕໍ່ການໃຊ້ວິທະຍຸ ແລະແບັດເຕີຣີ, ຈະມີການແຈ້ງເຕືອນແບບຖາວອນທີ່ສະແດງວ່າ ${app_name} ກຳລັງຟັງເຫດການ.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time">ປັບໃຫ້ເຫມາະສໍາລັບເວລາທີ່ແທ້ຈິງ</string>
+    <string name="settings_background_fdroid_sync_mode_battery_description">${app_name} ຈະຊິ້ງຂໍ້ມູນໃນພື້ນຫຼັງເພື່ອຮັກສາຊັບພະຍາກອນທີ່ຈຳກັດຂອງອຸປະກອນ (ແບັດເຕີຣີ).
+\nອີງຕາມສະຖານະຊັບພະຍາກອນອຸປະກອນຂອງທ່ານ, ການຊິງຄ໌ອາດຈະຖືກເລື່ອນໂດຍລະບົບປະຕິບັດການ.</string>
+    <string name="settings_background_fdroid_sync_mode_battery">ເຫມາະສໍາລັບເເບັດເຕີລີ</string>
+    <string name="settings_background_fdroid_sync_mode">ຮູບແບບການຊິງຄ໌ພື້ນຫຼັງ</string>
+    <string name="settings_background_sync">ການຊິ້ງຂໍ້ມູນພື້ນຫຼັງ</string>
+    <string name="settings_mentions_and_keywords_encryption_notice">ທ່ານຈະບໍ່ໄດ້ຮັບການແຈ້ງເຕືອນສໍາລັບການກ່າວເຖິງ &amp; ຄໍາສໍາຄັນຢູ່ໃນຫ້ອງທີ່ເຂົ້າລະຫັດຢູ່ໃນມືຖື.</string>
+    <string name="settings_room_upgrades">ການຍົກລະດັບຫ້ອງ</string>
+    <string name="settings_messages_by_bot">ຂໍ້ຄວາມຈາກ bot</string>
+    <string name="settings_call_invitations">ໂທເຊີນ</string>
+    <string name="settings_room_invitations">ການເຊີນດເຂົ້າຫ້ອງ</string>
+    <string name="settings_messages_containing_keywords">ຄໍາສໍາຄັນ</string>
+    <string name="settings_mentions_at_room">\@room</string>
+    <string name="settings_encrypted_group_messages">ເຂົ້າລະຫັດຂໍ້ຄວາມກຸ່ມ</string>
+    <string name="settings_group_messages">ຂໍ້ຄວາມກຸ່ມ</string>
+    <string name="settings_encrypted_direct_messages">ເຂົ້າລະຫັດຂໍ້ຄວາມໂດຍກົງ</string>
+    <string name="settings_messages_direct_messages">ຂໍ້ຄວາມໂດຍກົງ</string>
+    <string name="settings_messages_containing_username">ຊື່ຜູ້ໃຊ້ຂອງຂ້ອຍ</string>
+    <string name="settings_messages_containing_display_name">ຊື່ສະແດງຂອງຂ້ອຍ</string>
+    <string name="settings_messages_at_room">ຂໍ້ຄວາມທີ່ມີ @room</string>
+    <string name="settings_messages_sent_by_bot">ຂໍ້ຄວາມທີ່ສົ່ງໂດຍ bot</string>
+    <string name="settings_invited_to_room">ເມື່ອຂ້ອຍຖືກເຊີນເຂົ້າຫ້ອງ</string>
+    <string name="settings_enable_all_notif">ເປີດໃຊ້ການແຈ້ງເຕືອນສຳລັບບັນຊີນີ້</string>
+    <string name="settings_notification_ringtone">ສຽງແຈ້ງເຕືອນ</string>
+    <string name="settings_troubleshoot_test_battery_quickfix">ບໍ່ສົນໃຈການເພີ່ມປະສິດທິພາບ</string>
+    <string name="settings_troubleshoot_test_battery_failed">ຖ້າຫາກຜູ້ໃຊ້ປະອຸປະກອນບໍ່ໄດ້ສຽບປັກອຸດປະກອນ ແລະ ຢຸດຢູ່ໃນໄລຍະໜຶ່ງ, ໂດຍທີ່ໜ້າຈໍປິດຢູ່, ອຸປະກອນຈະເຂົ້າສູ່ໂໝດ Doze ແລະ ປ້ອງກັນບໍ່ໃຫ້ແອັບເຂົ້າເຖິງເຄື່ອຂ່າຍ ແລະ ເລື່ອນວຽກ, ການຊິງຄ໌ ແລະ ການເຕືອນມາດຕະຖານຂອງເຂົາເຈົ້າ.</string>
+    <string name="settings_troubleshoot_test_battery_success">${app_name} ບໍ່ໄດ້ຮັບຜົນກະທົບຈາກການເພີ່ມປະສິດທິພາບແບັດເຕີລີ.</string>
+    <string name="settings_troubleshoot_test_battery_title">ການເພີ່ມປະສິດທິພາບແບັດເຕີລີ</string>
+    <string name="settings_troubleshoot_test_bg_restricted_quickfix">ປິດການນຳໃຊ້ຂໍ້ຈຳກັດ</string>
+    <string name="settings_troubleshoot_test_bg_restricted_failed">ຂໍ້ຈຳກັດໃນພື້ນຫຼັງຖືກເປີດໃຊ້ສຳລັບ ${app_name}.
+\nວຽກທີ່ແອັບພະຍາຍາມເຮັດຈະຖືກຈຳກັດຢ່າງແຮງໃນຂະນະທີ່ມັນຢູ່ໃນພື້ນຫຼັງ, ແລະ ອັນນີ້ອາດຈະສົ່ງຜົນກະທົບຕໍ່ການແຈ້ງເຕືອນ.
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_bg_restricted_success">ການຈຳກັດພື້ນຫຼັງຖືກປິດການນຳໃຊ້ສຳລັບ ${app_name}. ການທົດສອບນີ້ຄວນຈະດໍາເນີນການໂດຍໃຊ້ອິນເຕີເນັດມືຖື (ບໍ່ມີ WIFI).
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_bg_restricted_title">ກວດເບິ່ງຂໍ້ຈໍາກັດໃນພື້ນຫລັງ</string>
+    <string name="settings_troubleshoot_test_service_boot_quickfix">ເປີດໃຊ້ເລີ່ມຕົ້ນ boot</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">ການບໍລິການຈະບໍ່ເລີ່ມຕົ້ນເມື່ອອຸປະກອນຖືກເລີ່ມຕົ້ນໃຫມ່, ທ່ານຈະບໍ່ໄດ້ຮັບການແຈ້ງເຕືອນຈົນກວ່າ ${app_name} ຈະເປີດຄັ້ງດຽວ.</string>
+    <string name="settings_troubleshoot_test_service_boot_success">ການບໍລິການຈະເລີ່ມເມື່ອອຸປະກອນຖືກເລີ່ມຕົ້ນໃຫມ່.</string>
+    <string name="settings_troubleshoot_test_service_boot_title">ເລີ່ມຕົ້ນ boot</string>
+    <string name="settings_troubleshoot_test_notification_notification_clicked">ການແຈ້ງເຕືອນໄດ້ຖືກກົດແລ້ວ!</string>
+    <string name="settings_troubleshoot_test_notification_notice">ກະລຸນາກົດໃສ່ການແຈ້ງເຕືອນ. ຖ້າທ່ານບໍ່ເຫັນການແຈ້ງເຕືອນ, ກະລຸນາກວດເບິ່ງການຕັ້ງຄ່າລະບົບ.</string>
+    <string name="settings_troubleshoot_test_notification_title">ການສະແດງການແຈ້ງເຕືອນ</string>
+    <string name="settings_troubleshoot_test_push_notification_content">ທ່ານກຳລັງເບິ່ງການແຈ້ງເຕືອນ! ກົດທີ່ຂ້ອຍ!</string>
+    <string name="keys_backup_setup_step1_advanced">(ຂັ້ນສູງ)</string>
+    <string name="keys_backup_setup">ເລີ່ມຕົ້ນການນໍາໃຊ້ການສໍາຮອງຂໍ້ມູນກະແຈ</string>
+    <string name="keys_backup_setup_step1_description">ຂໍ້ຄວາມຢູ່ໃນຫ້ອງທີ່ເຂົ້າລະຫັດໄວ້ແມ່ນປອດໄພດ້ວຍການເຂົ້າລະຫັດແບບຕົ້ນທາງເຖິງປາຍທາງ. ພຽງແຕ່ທ່ານ ແລະຜູ້ຮັບເທົ່ານັ້ນທີ່ມີກະແຈເພື່ອອ່ານຂໍ້ຄວາມເຫຼົ່ານີ້.
+\n
+\nສຳຮອງຂໍ້ມູນກະແຈຂອງທ່ານຢ່າງປອດໄພເພື່ອຫຼີກເວັ້ນການສູນເສຍພວກມັນ.</string>
+    <string name="keys_backup_setup_step1_title">ຂໍ້ຄວາມເຂົ້າລະຫັດບໍ່ເຄີຍສູນເສຍ</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">ກະລຸນາລຶບລະຫັດຜ່ານຖ້າທ່ານຕ້ອງການ ${app_name} ເພື່ອສ້າງລະຫັດການກູ້ຂໍ້ມູນ.</string>
+    <string name="passphrase_passphrase_too_weak">ປະໂຫຍກລະຫັດຜ່ານອ່ອນເກີນໄປ</string>
+    <string name="passphrase_empty_error_message">ກະລຸນາໃສ່ລະຫັດຜ່ານ</string>
+    <string name="passphrase_passphrase_does_not_match">ລະຫັດຜ່ານບໍ່ກົງກັນ</string>
+    <string name="passphrase_enter_passphrase">ໃສ່ລະຫັດຜ່ານ</string>
+    <string name="passphrase_confirm_passphrase">ຢືນຢັນລະຫັດຜ່ານ</string>
+    <string name="passphrase_create_passphrase">ສ້າງລະຫັດຜ່ານ</string>
+    <string name="no_valid_google_play_services_apk">ບໍ່ພົບ Google Play Services APK ທີ່ຖືກຕ້ອງ. ການແຈ້ງເຕືອນອາດຈະບໍ່ໃຊ້ງານຢ່າງຖືກຕ້ອງ.</string>
+    <string name="x_plus">%d+</string>
+    <string name="generic_label_and_value">%1$s: %2$s</string>
+    <string name="merged_events_collapse">ຫຼຸດລົງ</string>
+    <string name="merged_events_expand">ຂະຫຍາຍ</string>
+    <string name="unknown_error">ຂໍອະໄພ, ເກີດຄວາມຜິດພາດຂຶ້ນ</string>
+    <string name="resource_limit_hard_contact">ກະລຸນາ %s ເພື່ອສືບຕໍ່ໃຊ້ບໍລິການນີ້.</string>
+    <string name="resource_limit_soft_contact">ກະລຸນາ %s ເພື່ອເພີ່ມຂີດຈຳກັດນີ້.</string>
+    <string name="resource_limit_hard_mau">homeserver ນີ້ຮອດຂີດຈຳກັດຜູ້ໃຊ້ປະຈຳເດືອນແລ້ວ.</string>
+    <string name="resource_limit_soft_mau">" homeserver ນີ້ຮອດຂີດຈຳກັດຜູ້ໃຊ້ລາຍເດືອນຂອງມັນແລ້ວ ດັ່ງນັ້ນ &lt;b&gt;ຜູ້ໃຊ້ບາງຄົນຈະບໍ່ສາມາດເຂົ້າສູ່ລະບົບໄດ້&lt;/b&gt;."</string>
+    <string name="resource_limit_hard_default">homeserver ນີ້ ມີຊັບພະຍາກເກີນຂີດຈຳກັດໃດໜຶ່ງ.</string>
+    <string name="resource_limit_soft_default">ເຊີບເວີ homeserver ນີ້ເກີນຂີດຈຳກັດໃນຊັບພະຍາກອນຂອງມັນ ດັ່ງນັ້ນ &lt;b&gt;ຜູ້ໃຊ້ບາງຄົນຈະບໍ່ສາມາດເຂົ້າສູ່ລະບົບໄດ້&lt;/b&gt;.</string>
+    <string name="resource_limit_contact_admin">ຕິດຕໍ່ຜູ້ເບິ່ງແຍງການບໍລິການຂອງທ່ານ</string>
+    <string name="room_tombstone_predecessor_link">ກົດທີ່ນີ້ເພື່ອເບິ່ງຂໍ້ຄວາມເກົ່າ</string>
+    <string name="room_tombstone_continuation_description">ສືບຕໍ່ການສົນທະນາອື່ນໃນຫ້ອງນີ້</string>
+    <string name="room_tombstone_continuation_link">ການສົນທະນາສືບຕໍ່ຢູ່ທີ່ນີ້</string>
+    <string name="room_tombstone_versioned_description">ຫ້ອງນີ້ໄດ້ຖືກປ່ຽນແທນ ແລະບໍ່ມີການເຄື່ອນໄຫວອີກຕໍ່ໄປ.</string>
+    <string name="error_empty_field_your_password">ກະລຸນາໃສ່ລະຫັດຜ່ານຂອງທ່ານ.</string>
+    <string name="error_empty_field_enter_user_name">ກະລຸນາໃສ່ຊື່ຜູ້ໃຊ້.</string>
+    <string name="deactivate_account_submit">ປິດການນຳໃຊ້ບັນຊີ</string>
+    <string name="deactivate_account_delete_checkbox">ກະລຸນາລືມຂໍ້ຄວາມທັງໝົດທີ່ຂ້ອຍໄດ້ສົ່ງໄປເມື່ອບັນຊີຂອງຂ້ອຍຖືກປິດການນຳໃຊ້ (ຄຳເຕືອນ: ອັນນີ້ຈະເຮັດໃຫ້ຜູ້ໃຊ້ໃນອະນາຄົດເຫັນການສົນທະນາທີ່ບໍ່ຄົບຖ້ວນ)</string>
+    <string name="deactivate_account_content">ສິ່ງນີ້ຈະເຮັດໃຫ້ບັນຊີຂອງທ່ານບໍ່ສາມາດນຳໃຊ້ໄດ້ຢ່າງຖາວອນ. ທ່ານຈະບໍ່ສາມາດເຂົ້າສູ່ລະບົບໄດ້, ແລະບໍ່ມີໃຜຈະສາມາດລົງທະບຽນ ID ຜູ້ໃຊ້ດຽວກັນໄດ້. ນີ້ຈະເຮັດໃຫ້ບັນຊີຂອງທ່ານອອກຈາກຫ້ອງທັງຫມົດທີ່ໄດ້ເຂົ້າຮ່ວມ, ແລະມັນຈະເອົາລາຍລະອຽດບັນຊີຂອງທ່ານອອກຈາກເຊີບເວີຂອງທ່ານ. &lt;b&gt;ການດໍາເນີນການນີ້ບໍ່ສາມາດປີ້ນຄືນໄດ້&lt;/b&gt;.
+\n
+\nການປິດໃຊ້ງານບັນຊີຂອງທ່ານ &lt;b&gt;ບໍ່ໄດ້ເປັນຄ່າເລີ່ມຕົ້ນເຮັດໃຫ້ພວກເຮົາລືມຂໍ້ຄວາມທີ່ທ່ານໄດ້ສົ່ງໄປ&lt;/b&gt;. ຖ້າທ່ານຕ້ອງການໃຫ້ພວກເຮົາລືມຂໍ້ຄວາມຂອງທ່ານ, ກະລຸນາຫມາຍໃສ່ໃນກ່ອງຂ້າງລຸ່ມນີ້.
+\n
+\nການເບິ່ງເຫັນຂໍ້ຄວາມໃນ Matrix ແມ່ນຄ້າຍຄືກັນກັບອີເມວ. ການລືມຂໍ້ຄວາມຂອງພວກເຮົາຫມາຍຄວາມວ່າຂໍ້ຄວາມທີ່ທ່ານໄດ້ສົ່ງໄປຈະບໍ່ຖືກແບ່ງປັນກັບຜູ້ໃຊ້ໃຫມ່ຫຼືບໍ່ໄດ້ລົງທະບຽນ, ແຕ່ຜູ້ໃຊ້ທີ່ລົງທະບຽນແລ້ວທີ່ມີການເຂົ້າເຖິງຂໍ້ຄວາມເຫຼົ່ານີ້ຈະຍັງຄົງມີການເຂົ້າເຖິງສໍາເນົາຂອງພວກເຂົາ.</string>
+    <string name="deactivate_account_title">ປິດການນຳໃຊ້ບັນຊີ</string>
+    <string name="dialog_user_consent_submit">ກວດເບິ່ງດຽວນີ້</string>
+    <string name="dialog_user_consent_content">ເພື່ອສືບຕໍ່ນຳໃຊ້ %1$s homeserver ທ່ານຕ້ອງທົບທວນຄືນ ແລະ ຕົກລົງເຫັນດີກັບຂໍ້ກຳນົດ ແລະເງື່ອນໄຂ.</string>
+    <string name="avatar">ຮູບແທນຕົວ</string>
+    <string name="reason_colon">ເຫດຜົນ: %1$s</string>
+    <string name="has_been_banned">ທ່ານໄດ້ຖືກຫ້າມຈາກ %1$s ໂດຍ %2$s</string>
+    <string name="has_been_removed">ທ່ານໄດ້ຖືກລຶບອອກຈາກ %1$s ໂດຍ %2$s</string>
+    <string name="invited">ເຊີນ</string>
+    <string name="rooms">ຫ້ອງ</string>
+    <string name="group_details_home">ຫນ້າທໍາອິ</string>
+    <string name="create">ສ້າງ</string>
+    <string name="encrypted_message">ຂໍ້ຄວາມເຂົ້າລະຫັດ</string>
+    <string name="notification_noisy">ສຽງດັງ</string>
+    <string name="notification_silent">ງຽບ</string>
+    <string name="notification_off">ປິດ</string>
+    <string name="markdown_has_been_disabled">Markdown ໄດ້ຖືກປິດໃຊ້ງານ.</string>
+    <string name="markdown_has_been_enabled">ເປີດໃຊ້ Markdown ແລ້ວ.</string>
+    <string name="command_description_whois">ສະແດງຂໍ້ມູນກ່ຽວກັບຜູ້ໃຊ້</string>
+    <string name="command_description_clear_scalar_token">ເພື່ອແກ້ໄຂການຈັດການແອັບ Matrix</string>
+    <string name="command_description_markdown">ເປີດ/ປິດ markdown</string>
+    <string name="command_description_avatar_for_room">ປ່ຽນຮູບແທນຕົວຂອງທ່ານຢູ່ໃນຫ້ອງປັດຈຸບັນນີ້ເທົ່ານັ້ນ</string>
+    <string name="command_description_room_avatar">ປ່ຽນຮູບແທນຕົວຂອງຫ້ອງປັດຈຸບັນ</string>
+    <string name="command_description_nick_for_room">ປ່ຽນຊື່ສະແດງຂອງທ່ານໃນຫ້ອງປັດຈຸບັນເທົ່ານັ້ນ</string>
+    <string name="command_description_nick">ປ່ຽນຊື່ສະແດງຂອງທ່ານ</string>
+    <string name="command_description_remove_user">ລຶບຜູ້ໃຊ້ທີ່ມີ ID ໃຫ້ອອກຈາກຫ້ອງນີ້</string>
+    <string name="command_description_topic">ກໍານົດຫົວຂໍ້ຫ້ອງ</string>
+    <string name="command_description_part_room">ອອກຈາກຫ້ອງ</string>
+    <string name="command_description_join_room">ເຂົ້າຮ່ວມຫ້ອງຕາມທີ່ຢູ່ໄດ້ລະບຸໃຫ້</string>
+    <string name="command_description_invite_user">ເຊີນຜູ້ໃຊ້ທີ່ມີ id ໃຫ້ກັບຫ້ອງປະຈຸບັນ</string>
+    <string name="command_description_room_name">ກຳນົດຊື່ຫ້ອງ</string>
+    <string name="command_description_deop_user">Deops ຜູ້ໃຊ້ທີ່ມີ ID</string>
+    <string name="command_description_op_user">ກໍານົດລະດັບພະລັງງານຂອງຜູ້ໃຊ້</string>
+    <string name="command_description_unignore_user">ຢຸດເຊົາການບໍ່ສົນໃຈຜູ້ໃຊ້, ສະແດງຂໍ້ຄວາມຂອງພວກເຂົາຕໍ່ໄປ</string>
+    <string name="command_description_ignore_user">ບໍ່ສົນໃຈຜູ້ໃຊ້, ເຊື່ອງຂໍ້ຄວາມຂອງເຂົາເຈົ້າໂດຍທ່ານ</string>
+    <string name="command_description_unban_user">ຍົກເລີກການຫ້າມຜູ້ໃຊ້ທີ່ມີ ID</string>
+    <string name="command_description_ban_user">ຫ້າມຜູ້ໃຊ້ທີ່ມີ ID ທີ່ກຳນົດໃຫ້</string>
+    <string name="command_description_emote">ສະແດງການປະຕິບັດ</string>
+    <string name="command_not_supported_in_threads">ຄຳສັ່ງ \"%s\" ຖືກຮັບຮູ້ແຕ່ບໍ່ຮອງຮັບໃນກະທູ້.</string>
+    <string name="command_problem_with_parameters">ຄໍາສັ່ງ \"%s\" ຕ້ອງການຕົວກໍານົດການເພີ່ມເຕີມ, ຫຼື ບາງພາລາມິເຕີບໍ່ຖືກຕ້ອງ.</string>
+    <string name="unrecognized_command">ຄຳສັ່ງທີ່ບໍ່ຮູ້ຈັກ: %s</string>
+    <string name="command_error">ຄໍາສັ່ງຜິດພາດ</string>
+    <string name="ignore_request_short_label">ບໍ່ສົນໃຈ</string>
+    <string name="key_share_request">ການຮ້ອງຂໍການແບ່ງປັນທີ່ສໍາຄັນ</string>
+    <string name="share_without_verifying_short_label">ແບ່ງປັນ</string>
+    <string name="start_verification">ເລີ່ມການຢັ້ງຢືນ</string>
+    <string name="your_unverified_device_requesting_with_info">ລະບົບທີ່ບໍ່ໄດ້ຮັບການຢືນຢັນກໍາລັງຮ້ອງຂໍການເຂົ້າລະຫັດ.
+\nຊື່ລະບົບ: %1$s
+\nເຫັນຄັ້ງສຸດທ້າຍ: %2$s
+\nຖ້າທ່ານບໍ່ໄດ້ເຂົ້າສູ່ລະບົບອື່ນ, ບໍ່ສົນໃຈຄໍາຮ້ອງຂໍນີ້.</string>
+    <string name="your_unverified_device_requesting">ລະບົບທີ່ບໍ່ໄດ້ຮັບການຢືນຢັນຂອງທ່ານ \'%s\' ກໍາລັງຮ້ອງຂໍການເຂົ້າລະຫັດ.</string>
+    <string name="you_added_a_new_device_with_info">ລະບົບໃໝ່ກຳລັງຮ້ອງຂໍການເຂົ້າລະຫັດ.
+\nຊື່ລະບົບ: %1$s
+\nເຫັນຄັ້ງສຸດທ້າຍ: %2$s
+\nຖ້າທ່ານບໍ່ໄດ້ເຂົ້າສູ່ລະບົບອື່ນ, ບໍ່ສົນໃຈຄໍາຮ້ອງຂໍນີ້.</string>
+    <string name="you_added_a_new_device">ທ່ານໄດ້ເພີ່ມລະບົບໃໝ່ \'%s\', ເຊິ່ງກຳລັງຮ້ອງຂໍການເຂົ້າລະຫັດ.</string>
+    <string name="widget_integration_review_terms">ເພື່ອສືບຕໍ່, ທ່ານຈໍາເປັນຕ້ອງຍອມຮັບເງື່ອນໄຂຂອງການບໍລິການນີ້.</string>
+    <string name="settings_labs_native_camera_summary">ເລີ່ມກ້ອງລະບົບແທນໜ້າຈໍກ້ອງແບບກຳນົດເອງ.</string>
+    <string name="settings_labs_native_camera">ໃຊ້ກ້ອງຖ່າຍຮູບລູ້ນດັ່ງເດີມ</string>
+    <string name="room_no_active_widgets">ບໍ່ມີ widget ທີ່ໃຊ້ງານຢູ່</string>
+    <string name="room_manage_integrations">ຈັດການການເຊື່ອມໂຍງ</string>
+    <string name="room_add_matrix_apps">ເພີ່ມແອັບ Matrix</string>
+    <string name="widget_integration_missing_parameter">ບໍ່ມີparameter ທີ່ຕ້ອງການ.</string>
+    <string name="widget_integration_room_not_visible">ບໍ່ເຫັນຫ້ອງ %s.</string>
+    <string name="widget_integration_missing_user_id">ບໍ່ມີ user_id ໃນການຮ້ອງຂໍ.</string>
+    <string name="widget_integration_missing_room_id">ບໍ່ມີ room_id ໃນການຮ້ອງຂໍ.</string>
+    <string name="widget_integration_no_permission_in_room">ທ່ານບໍ່ໄດ້ຮັບອະນຸຍາດໃຫ້ເຮັດສິ່ງນັ້ນຢູ່ໃນຫ້ອງນີ້.</string>
+    <string name="widget_integration_must_be_in_room">ທ່ານບໍ່ໄດ້ຢູ່ໃນຫ້ອງນີ້.</string>
+    <string name="widget_integration_positive_power_level">ລະດັບພະລັງງານຈະຕ້ອງເປັນຈຳນວນບວກ.</string>
+    <string name="widget_integration_failed_to_send_request">ສົ່ງຄຳຮ້ອງຂໍບໍ່ສຳເລັດ.</string>
+    <string name="widget_integration_unable_to_create">ບໍ່ສາມາດສ້າງ widget ໄດ້.</string>
+    <string name="room_widget_webview_read_protected_media">ອ່ານສື່ທີ່ມີການປ້ອງກັນ DRM</string>
+    <string name="room_widget_webview_access_microphone">ໃຊ້ໄມໂຄຣໂຟນ</string>
+    <string name="room_widget_webview_access_camera">ໃຊ້ກ້ອງຖ່າຍຮູບ</string>
+    <string name="room_widget_resource_decline_permission">ບລັອກທັງໝົດ</string>
+    <string name="room_widget_resource_grant_permission">ອະນຸຍາດ</string>
+    <string name="room_widget_resource_permission_title">widget ນີ້ຕ້ອງການໃຊ້ຊັບພະຍາກອນຕໍ່ໄປນີ້:</string>
+    <string name="jitsi_leave_conf_to_join_another_one_content">ອອກຈາກກອງປະຊຸມປະຈຸບັນ ແລະປ່ຽນໄປຫາກອງປະຊຸມອື່ນບໍ\?</string>
+    <string name="error_jitsi_join_conf">ຂໍອະໄພ, ເກີດຄວາມຜິດພາດຂຶ້ນໃນຂະນະທີ່ພະຍາຍາມເຂົ້າຮ່ວມກອງປະຊຸມ</string>
+    <string name="error_jitsi_not_supported_on_old_device">ຂໍອະໄພ, ການປະຊຸມການໂທດ້ວຍ Jitsi ບໍ່ຮອງຮັບໃນອຸປະກອນເກົ່າ (ອຸປະກອນທີ່ມີ Android OS ຕ່ຳກວ່າ 6.0)</string>
+    <string name="room_widget_permission_room_id">ID ຫ້ອງ</string>
+    <string name="room_widget_permission_widget_id">ໄອດີວິດເຈັດ</string>
+    <string name="room_widget_permission_theme">ຫົວຂໍ້ຂອງທ່ານ</string>
+    <string name="room_widget_permission_user_id">ID ຜູ້ໃຊ້ຂອງທ່ານ</string>
+    <string name="room_widget_permission_avatar_url">URL ຮູບແທນຕົວຂອງທ່ານ</string>
+    <string name="room_widget_permission_display_name">ຊື່ສະແດງຂອງທ່ານ</string>
+    <string name="room_widget_revoke_access">ຖອນສິດການເຂົ້າເຖິງສໍາລັບຂ້ອຍ</string>
+    <string name="room_widget_open_in_browser">ເປີດໃນ browser</string>
+    <string name="room_widget_reload">ໂຫຼດວິດເຈັດຄືນໃໝ່</string>
+    <string name="room_widget_failed_to_load">ໂຫຼດ widget ບໍ່ສຳເລັດ.
+\n%s</string>
+    <string name="room_widget_permission_shared_info_title">ການໃຊ້ອາດຈະແບ່ງປັນຂໍ້ມູນກັບ %s:</string>
+    <string name="room_widget_permission_webview_shared_info_title">ການໃຊ້ອາດຈະຕັ້ງ cookies ແລະແບ່ງປັນຂໍ້ມູນກັບ %s:</string>
+    <string name="room_widget_permission_added_by">widget ນີ້ຖືກເພີ່ມໂດຍ:</string>
+    <string name="room_widget_permission_title">ໂຫຼດ Widget</string>
+    <string name="room_widget_activity_title">ວິດເຈັດ</string>
+    <string name="active_widgets_title">ວິດເຈັດທີ່ໃຊ້ຢູ່</string>
+    <string name="active_widget_view_action">ເບິ່ງ</string>
+    <plurals name="active_widgets">
+        <item quantity="other">%d ວິດເຈັດທີ່ໃຊ້ຢູ່</item>
+    </plurals>
+    <string name="widget_delete_message_confirmation">ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການລຶບວິດເຈັດອອກຈາກຫ້ອງນີ້\?</string>
+    <string name="huge">ໃຫຍ່</string>
+    <string name="largest">ໃຫຍ່ທີ່ສຸດ</string>
+    <string name="larger">ໃຫຍ່ກວ່າ</string>
+    <string name="large">ໃຫຍ່</string>
+    <string name="normal">ປົກກະຕິ</string>
+    <string name="small">ນ້ອຍ</string>
+    <string name="tiny">ນ້ອຍໆ</string>
+    <string name="font_size">ຂະໜາດຕົວອັກສອນ</string>
+    <string name="notification_ticker_text_group">%1$s: %2$s%3$s</string>
+    <string name="notification_ticker_text_dm">%1$s: %2$s</string>
+    <string name="notification_inline_reply_failed">** ການສົ່ງ ບໍ່ສໍາເລັດ- ກະລຸນາເປີດຫ້ອງ</string>
+    <string name="notification_sender_me">ຂ້ອຍ</string>
+    <string name="notification_new_invitation">ເຊີນໃໝ່</string>
+    <string name="notification_new_messages">ຂໍ້ຄວາມໃໝ່</string>
+    <string name="notification_unknown_room_name">ຫ້ອງ</string>
+    <string name="notification_unknown_new_event">ເຫດການໃໝ່</string>
+    <string name="notification_unread_notified_messages_and_invitation">%1$s ແລະ %2$s</string>
+    <string name="notification_unread_notified_messages_in_room_and_invitation">%1$s ໃນ %2$s ແລະ %3$s</string>
+    <string name="notification_unread_notified_messages_in_room">%1$s ໃນ %2$s</string>
+    <plurals name="notification_compat_summary_title">
+        <item quantity="other">%d ການແຈ້ງເຕືອນ</item>
+    </plurals>
+    <plurals name="notification_compat_summary_line_for_room">
+        <item quantity="other">%1$s: %2$d ຂໍ້ຄວາມ</item>
+    </plurals>
+    <plurals name="notification_invitations">
+        <item quantity="other">%d ການເຊີນ</item>
+    </plurals>
+    <plurals name="notification_unread_notified_messages_in_room_rooms">
+        <item quantity="other">%d ຫ້ອງ</item>
+    </plurals>
+    <plurals name="notification_unread_notified_messages">
+        <item quantity="other">%d ຂໍ້ຄວາມແຈ້ງເຕືອນທີ່ຍັງບໍ່ໄດ້ອ່ານ</item>
+    </plurals>
+    <string name="directory_add_a_new_server_error_already_added">ເຊີບເວີນີ້ມີຢູ່ໃນລາຍຊື່ແລ້ວ</string>
+    <string name="directory_add_a_new_server_error">ບໍ່ສາມາດຊອກຫາເຊີບເວີນີ້ ຫຼື ລາຍຊື່ຫ້ອງໄດ້</string>
+    <string name="directory_add_a_new_server_prompt">ໃສ່ຊື່ຂອງເຊີບເວີໃໝ່ທີ່ທ່ານຕ້ອງການສຳຫຼວດ.</string>
+    <string name="directory_add_a_new_server">ເພີ່ມເຊິບເວີໃຫມ່</string>
+    <string name="directory_your_server">ເຊີບເວີຂອງທ່ານ</string>
+    <string name="directory_server_native_rooms">ທັງໝົດ %s ຫ້ອງ</string>
+    <string name="directory_server_all_rooms_on_server">ຫ້ອງທັງໝົດຢູ່ໃນເຊີບເວີ %s</string>
+    <string name="directory_server_placeholder">ຊື່ເຊີບເວີ</string>
+    <string name="select_room_directory">ເລືອກລາຍການຫ້ອງ</string>
+    <string name="encryption_information_verify_device_warning2">ຖ້າລະຫັດບໍ່ກົງກັນ, ຄວາມປອດໄພຂອງການສື່ສານຂອງທ່ານອາດຈະຖືກທໍາລາຍ.</string>
+    <string name="settings_messages_in_group_chat">ຂໍ້ຄວາມໃນກຸ່ມສົນທະນາ</string>
+    <string name="settings_messages_in_one_to_one">ຂໍ້ຄວາມການສົນທະນາຫນຶ່ງຕໍ່ຫນຶ່ງ</string>
+    <string name="settings_containing_my_user_name">ຂໍ້ຄວາມທີ່ມີຊື່ຜູ້ໃຊ້ຂອງຂ້ອຍ</string>
+    <string name="settings_containing_my_display_name">ຂໍ້ຄວາມທີ່ມີຊື່ສະແດງຂອງຂ້ອຍ</string>
+    <string name="settings_when_rooms_are_upgraded">ເມື່ອມີການຍົກລະດັບຫ້ອງ</string>
+    <string name="settings_messages_in_e2e_group_chat">ຂໍ້ຄວາມເຂົ້າລະຫັດໃນການສົນທະນາກຸ່ມ</string>
+    <string name="settings_messages_in_e2e_one_to_one">ຂໍ້ຄວາມທີ່ຖືກເຂົ້າລະຫັດໃນການສົນທະນາແບບຫນຶ່ງຕໍ່ຫນຶ່ງ</string>
+    <string name="settings_system_preferences_summary">ເລືອກສີ LED, ການສັ່ນ, ສຽງ…</string>
+    <string name="settings_silent_notifications_preferences">ຕັ້ງຄ່າການແຈ້ງເຕືອນງຽບ</string>
+    <string name="settings_call_notifications_preferences">ຕັ້ງຄ່າການແຈ້ງເຕືອນການໂທ</string>
+    <string name="settings_noisy_notifications_preferences">ຕັ້ງຄ່າການແຈ້ງເຕືອນສຽງລົບກວນ</string>
+    <string name="settings_enable_this_device">ປີດໃຊ້ການແຈ້ງເຕືອນສຳລັບລະບົບນີ້</string>
+    <string name="room_using_unstable_room_version">ຫ້ອງນີ້ກຳລັງຕິດຕັ້ງເວີຊັ້ນຫ້ອງ %s, ເຊິ່ງ homeserver ນີ້ໄດ້ເຮັດເຄື່ອງໝາຍບໍ່ສະຖຽນໄວ້.</string>
+    <string name="upgrade_room_no_power_to_manage">ທ່ານຕ້ອງໄດ້ຮັບການອະນຸຍາດເພື່ອຍົກລະດັບຫ້ອງ</string>
+    <string name="upgrade_room_update_parent_space">ອັບເດດພຶ້ນທີ່ອັດຕະໂນມັດ</string>
+    <string name="upgrade_room_auto_invite">ເຊີນຜູ້ໃຊ້ອັດຕະໂນມັດ</string>
+    <string name="upgrade_public_room_from_to">ທ່ານຈະຍົກລະດັບຫ້ອງນີ້ຈາກ %1$s ເປັນ %2$s.</string>
+    <string name="upgrade_room_warning">ການຍົກລະດັບຫ້ອງແມ່ນເປັນການດຳເນີນການຂັ້ນສູງ ແລະ ປົກກະຕິແລ້ວແມ່ນແນະນຳເມື່ອຫ້ອງບໍ່ສະຖຽນເນື່ອງຈາກມີຂໍ້ບົກພ່ອງ, ຄຸນສົມບັດທີ່ຂາດຫາຍໄປ ຫຼື ຊ່ອງໂຫວ່ດ້ານຄວາມປອດໄພ.
+\nປົກກະຕິແລ້ວນີ້ມີຜົນຕໍ່ການການປະມວນຜົນຫ້ອງຢູ່ໃນເຊີບເວີ.</string>
+    <string name="upgrade_private_room">ຍົກລະດັບຫ້ອງສ່ວນຕົວ</string>
+    <string name="upgrade_public_room">ຍົກລະດັບຫ້ອງສາທາລະນະ</string>
+    <string name="upgrade_required">ຕ້ອງການຍົກລະດັບ</string>
+    <string name="upgrade">ຍົກລະດັບ</string>
+    <string name="it_may_take_some_time">ກະລຸນາລໍຖ້າ, ມັນອາດຈະໃຊ້ເວລາຄາວໜຶ່ງ.</string>
+    <string name="joining_replacement_room">ເຂົ້າຮ່ວມຫ້ອງແທນ</string>
+    <string name="unnamed_room">ບໍ່ມີຊື່ຫ້ອງ</string>
+    <string name="this_space_has_no_rooms_admin">ບາງຫ້ອງອາດຈະຖືກເຊື່ອງໄວ້ເພາະວ່າເປັນສ່ວນຕົວ ແລະ ທ່ານຕ້ອງໄດ້ຮັບການເຊີນ</string>
+    <string name="this_space_has_no_rooms_not_admin">ບາງຫ້ອງອາດຈະຖືກເຊື່ອງໄວ້ເພາະວ່າເປັນສ່ວນຕົວ ແລະ ທ່ານຕ້ອງການການເຊີນ.
+\nທ່ານບໍ່ໄດ້ຮັບອະນຸຍາດໃຫ້ເພີ່ມຫ້ອງ.</string>
+    <string name="this_space_has_no_rooms">ພື້ນທີ່ນີ້ບໍ່ມີຫ້ອງ</string>
+    <string name="spaces_no_server_support_description">ກະລຸນາຕິດຕໍ່ຜູ້ເບິ່ງແຍງເຊີບເວີຂອງທ່ານສຳລັບຂໍ້ມູນເພີ່ມເຕີມ</string>
+    <string name="spaces_no_server_support_title">ເບິ່ງຄືວ່າ homeserver ຂອງທ່ານຍັງບໍ່ຮອງຮັບ ພື້ນທີ່ ເທື່ອ</string>
+    <string name="spaces_feeling_experimental_subspace">ຮູ້ສຶກວ່າທົດລອງ\?
+\nທ່ານສາມາດເພີ່ມພື້ນທີ່ທີ່ມີຢູ່ໄປຍັງອີກພຶ້ນທີ່ໜຶ່ງ.</string>
+    <string name="all_rooms_youre_in_will_be_shown_in_home">ຫ້ອງທັງໝົດທີ່ທ່ານຢູ່ຈະຖືກສະແດງຢູ່ໃນໜ້າທຳອິດ.</string>
+    <string name="preference_show_all_rooms_in_home">ສະແດງຫ້ອງທັງໝົດໃນໜ້າທຳອິດ</string>
+    <string name="space_manage_rooms_and_spaces">ຈັດການຫ້ອງ ແລະ ພື້ນທີ່ຕ່າງໆ</string>
+    <string name="space_mark_as_not_suggested">ໝາຍວ່າບໍ່ໄດ້ແນະນຳ</string>
+    <string name="space_mark_as_suggested">ໝາຍຕາມທີ່ແນະນຳ</string>
+    <string name="space_suggested">ແນະນຳ</string>
+    <string name="space_settings_manage_rooms">ຈັດການຫ້ອງ</string>
+    <string name="looking_for_someone_not_in_space">ຊອກຫາຄົນທີ່ບໍ່ໄດ້ຢູ່ໃນ %s ບໍ\?</string>
+    <string name="user_invites_you">%s ເຊີນທ່ານ</string>
+    <string name="labs_enable_thread_messages_desc">ໝາຍເຫດ: ແອັບຈະຖືກເປີດຄືນໃໝ່</string>
+    <string name="labs_enable_thread_messages">ເປີດໃຊ້ຂໍ້ຄວາມກະທູ້</string>
+    <string name="labs_auto_report_uisi_desc">ລະບົບຂອງທ່ານຈະສົ່ງບັນທຶກອັດຕະໂນມັດເມື່ອເກີດຄວາມຜິດພາດທີ່ບໍ່ສາມາດຖອດລະຫັດໄດ້</string>
+    <string name="labs_auto_report_uisi">ລາຍງານຄວາມຜິດພາດໃນການຖອດລະຫັດອັດຕະໂນມັດ.</string>
+    <string name="you_are_invited">ທ່ານໄດ້ຮັບເຊີນ</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">ພື້ນທີ່ເປັນວິທີໃໝ່ໃນການຈັດກຸ່ມຫ້ອງ ແລະ ຄົນ.</string>
+    <string name="space_add_space_to_any_space_you_manage">ເພີ່ມພື້ນທີ່ໃສ່ບ່ອນໃດກໍໄດ້ທີ່ທ່ານຈັດການ.</string>
+    <string name="space_add_existing_spaces">ເພີ່ມພື້ນທີ່ທີ່ມີຢູ່</string>
+    <string name="space_add_existing_rooms_only">ເພີ່ມຫ້ອງທີ່ມີຢູ່</string>
+    <string name="space_add_existing_rooms">ເພີ່ມຫ້ອງ ແລະພື້ນທີ່ທີ່ມີຢູ່</string>
+    <string name="pick_tings_to_leave">ເລືອກສິ່ງທີ່ຕ້ອງອອກໄປ</string>
+    <string name="leave_specific_ones">ອອກຈາກຫ້ອງ ແລະພື້ນທີ່ສະເພາະ…</string>
+    <string name="dont_leave_any">ຢ່າອອກຈາກຫ້ອງ ແລະ ພື້ນທີ່ໃດໆ</string>
+    <string name="leave_all_rooms_and_spaces">ອອກຈາກຫ້ອງ ແລະ ພື້ນທີ່ທັງໝົດ</string>
+    <string name="space_leave_prompt_msg_as_admin">ທ່ານພຽງຜູ້ທີ່ເບິ່ງແຍງລະບົບພື້ນທີ່ນີ້. ການອອກຈາກລະບົບນັ້ນຫມາຍຄວາມວ່າບໍ່ມີໃຜຄວບຄຸມມັນ.</string>
+    <string name="space_leave_prompt_msg_private">ທ່ານຈະບໍ່ສາມາດເຂົ້າຮ່ວມຄືນໃໝ່ໄດ້ເວັ້ນເສຍແຕ່ວ່າທ່ານໄດ້ຮັບເຊີນຄືນໃໝ່.</string>
+    <string name="space_leave_prompt_msg_only_you">ທ່ານເປັນຄົນດຽວຢູ່ທີ່ນີ້. ຖ້າທ່ານອອກໄປ, ບໍ່ມີໃຜຈະສາມາດເຂົ້າຮ່ວມໃນອະນາຄົດ, ລວມທັງທ່ານ.</string>
+    <string name="space_leave_prompt_msg_with_name">ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການອອກຈາກ %s\?</string>
+    <string name="leave_space">ອອກໄປ</string>
+    <string name="space_add_child_title">ເພີ່ມຫ້ອງ</string>
+    <string name="space_explore_activity_title">ສຳຫຼວດຫ້ອງ</string>
+    <plurals name="space_people_you_know">
+        <item quantity="other">%d ຄົນທີ່ທ່ານຮູ້ຈັກໄດ້ເຂົ້າຮ່ວມຢູ່ກ່ອນແລ້ວ</item>
+    </plurals>
+    <string name="discovery_section">ການຄົ້ນພົບ (%s)</string>
+    <string name="finish_setup">ສຳເລັດການຕັ້ງຄ່າ</string>
+    <string name="discovery_invite">ເຊີນທາງອີເມວ, ຊອກຫາລາຍຊື່ຜູ້ຕິດຕໍ່ ແລະ ອື່ນໆອີກ…</string>
+    <string name="finish_setting_up_discovery">ສຳເລັດການຕັ້ງຄ່າການຄົ້ນຫາ.</string>
+    <string name="create_space_identity_server_info_none">ໃນປັດຈຸບັນນີ້ທ່ານບໍ່ໄດ້ໃຊ້ເຊີບເວີ. ເພື່ອເຊີນເພື່ອນຮ່ວມທີມ ແລະ ສາມາດຄົ້ນຫາໄດ້ໂດຍພວກເຂົາ,ກຳນົດຄ່າຂ້າງລຸ່ມນີ້.</string>
+    <string name="room_alias_preview_not_found">ບໍ່ສາມາດເຂົ້າເຖິງນາມແຝງນີ້ໄດ້ໃນເວລານີ້.
+\nລອງໃໝ່ໃນພາຍຫຼັງ, ຫຼື ຖາມຜູ້ເບິ່ງແຍງຫ້ອງເພື່ອກວດເບິ່ງວ່າທ່ານມີການເຂົ້າເຖິງຫຼືບໍ່.</string>
+    <string name="join_anyway">ເຂົ້າຮ່ວມເລີຍ</string>
+    <string name="call_tile_video_call_has_ended">ສິ້ນສຸດການໂທດ້ວຍວິດີໂອ • %1$s</string>
+    <string name="call_tile_voice_call_has_ended">ສິ້ນສຸດການໂທ • %1$s</string>
+    <string name="call_tile_video_active">ການໂທວິດີໂອ</string>
+    <string name="call_tile_voice_active">ໂທດ້ວຍສຽງ</string>
+    <string name="call_tile_video_incoming">ໂທວິດີໂອເຂົ້າມາ</string>
+    <string name="call_tile_voice_incoming">ສາຍໂທເຂົ້າ</string>
+    <string name="call_tile_call_back">ໂທກັບ</string>
+    <string name="call_tile_ended">ການໂທນີ້ສິ້ນສຸດລົງ</string>
+    <string name="call_tile_other_declined">%1$s ປະຕິເສດການໂທນີ້</string>
+    <string name="call_tile_you_declined_this_call">ທ່ານໄດ້ປະຕິເສດການໂທນີ້</string>
+    <string name="warning_unsaved_change_discard">ຍົກເລີກການປ່ຽນແປງ</string>
+    <string name="warning_unsaved_change">ມີການປ່ຽນແປງທີ່ບໍ່ໄດ້ບັນທຶກໄວ້. ຍົກເລີກການປ່ຽນແປງບໍ\?</string>
+    <string name="warning_room_not_created_yet">ບໍ່ທັນໄດ້ສ້າງຫ້ອງ. ຍົກເລີກການສ້າງຫ້ອງບໍ\?</string>
+    <string name="universal_link_malformed">ການເຊື່ອມຕໍ່ບໍ່ຖືກຕ້ອງ</string>
+    <string name="qr_code_not_scanned">ບໍ່ໄດ້ສະແກນລະຫັດ QR!</string>
+    <string name="invalid_qr_code_uri">ລະຫັດ QR ບໍ່ຖືກຕ້ອງ (URI ບໍ່ຖືກຕ້ອງ)!</string>
+    <string name="cannot_dm_self">DM ຕົວເອງບໍ່ໄດ້!</string>
+    <string name="share_by_text">ແບ່ງປັນຂໍ້ຄວາມ</string>
+    <string name="room_error_not_found">ບໍ່ພົບຫ້ອງນີ້. ໃຫ້ແນ່ໃຈວ່າມີຢູ່.</string>
+    <string name="error_opening_banned_room">ບໍ່ສາມາດເປີດຫ້ອງທີ່ຖືກຫ້າມໄດ້.</string>
+    <string name="settings_security_pin_code_change_pin_summary">ປ່ຽນລະຫັດ PIN ປັດຈຸບັນຂອງທ່ານ</string>
+    <string name="settings_security_pin_code_change_pin_title">ປ່ຽນລະຫັດ PIN</string>
+    <string name="settings_security_pin_code_grace_period_summary_off">ຕ້ອງໃຊ້ລະຫັດ PIN ທຸກໆຄັ້ງທີ່ທ່ານເປີດ ${app_name}.</string>
+    <string name="settings_security_pin_code_grace_period_summary_on">ຕ້ອງໃຊ້ລະຫັດ PIN ຫຼັງຈາກບໍ່ໄດ້ໃຊ້ ${app_name}ເປັນເວລາ 2 ນາທີ.</string>
+    <string name="settings_security_pin_code_grace_period_title">ຕ້ອງການລະຫັດ PIN ຫຼັງຈາກ 2 ນາທີ</string>
+    <string name="settings_security_pin_code_notifications_summary_off">ສະແດງສະເພາະແຕ່ຈໍານວນຂໍ້ຄວາມທີ່ຍັງບໍ່ໄດ້ອ່ານໃນການແຈ້ງເຕືອນເທົ່ານັ້ນ.</string>
+    <string name="settings_security_pin_code_notifications_summary_on">ສະແດງລາຍລະອຽດເຊັ່ນ: ຊື່ຫ້ອງ ແລະ ເນື້ອໃນຂໍ້ຄວາມ.</string>
+    <string name="settings_security_pin_code_notifications_title">ສະແດງເນື້ອຫາໃນການແຈ້ງເຕືອນ</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_off">ລະຫັດ PIN ເປັນວິທີດຽວທີ່ຈະປົດລັອກ ${app_name}.</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_on">ເປີດໃຊ້ biometrics ສະເພາະອຸປະກອນ ເຊັ່ນ: ລາຍນິ້ວມື ແລະ ການຮັບຮູ້ໃບໜ້າ.</string>
+    <string name="settings_security_pin_code_use_biometrics_title">ເປີດໃຊ້ biometrics</string>
+    <string name="settings_security_pin_code_summary">ຖ້າທ່ານຕ້ອງການຕັ້ງຄ່າຄືນລະຫັດ PIN ຂອງທ່ານ, ແຕະ ລືມລະຫັດ PIN ເພື່ອອອກຈາກລະບົບ ແລະຕັ້ງຄ່າຄືນໃໝ່.</string>
+    <string name="settings_security_pin_code_title">ເປີດໃຊ້ງານ PIN</string>
+    <string name="settings_security_application_protection_screen_title">ຕັ້ງຄ່າການປ້ອງກັນ</string>
+    <string name="settings_security_application_protection_summary">ປົກປ້ອງການເຂົ້າເຖິງໂດຍໃຊ້ ລະຫັດ PIN ແລະ biometrics.</string>
+    <string name="settings_security_application_protection_title">ປົກປ້ອງການເຂົ້າເຖິງ</string>
+    <string name="auth_pin_reset_content">ເພື່ອຕັ້ງຄ່າລະຫັດ PIN ຂອງທ່ານ, ທ່ານຈະຕ້ອງເຂົ້າສູ່ລະບົບໃໝ່ ແລະສ້າງລະຫັດ PIN ໃໝ່.</string>
+    <string name="auth_pin_new_pin_action">ລະຫັດ PIN ໃໝ່</string>
+    <string name="auth_pin_reset_title">ຕັ້ງຄ່າ PIN ຄືນໃໝ່</string>
+    <string name="auth_pin_forgot">ລືມ PIN ບໍ\?</string>
+    <string name="auth_pin_title">ໃສ່ PIN ຂອງທ່ານ</string>
+    <string name="create_pin_confirm_failure">ການກວດສອບ PIN ບໍ່ສຳເລັດ, ກະລຸນາແຕະລະຫັດໃໝ່.</string>
+    <string name="create_pin_confirm_title">ຢືນຢັນ PIN</string>
+    <string name="create_pin_title">ເລືອກ PIN ເພື່ອຄວາມປອດໄພ</string>
+    <string name="too_many_pin_failures">ມີຂໍ້ຜິດພາດຫຼາຍເກີນໄປ, ທ່ານໄດ້ອອກຈາກລະບົບແລ້ວ</string>
+    <string name="wrong_pin_message_last_remaining_attempt">ຄໍາເຕືອນ! ຄວາມພະຍາຍາມຄັ້ງສຸດທ້າຍກ່ອນອອກຈາກລະບົບ!</string>
+    <plurals name="entries">
+        <item quantity="other">%d ການລົງທະບຽນ</item>
+    </plurals>
+    <plurals name="wrong_pin_message_remaining_attempts">
+        <item quantity="other">ລະຫັດຜິດ, ພະຍາຍາມອີກ %dຄັ້ງ</item>
+    </plurals>
+    <string name="alert_push_are_disabled_description">ກວດເບິ່ງການຕັ້ງຄ່າຂອງທ່ານເພື່ອເປີດໃຊ້ການແຈ້ງເຕືອນແບບ push</string>
+    <string name="alert_push_are_disabled_title">ການແຈ້ງເຕືອນແບບ Pushຖືກປິດໃຊ້ງານ</string>
+    <string name="failed_to_unban">ຜູ້ໃຊ້ UnBan ບໍ່ສຳເລັດ</string>
+    <string name="member_banned_by">ຫ້າມໂດຍ %1$s</string>
+    <string name="three_pid_revoke_invite_dialog_content">ຍົກເລີກການເຊີນໄປຫາ %1$s ບໍ\?</string>
+    <string name="three_pid_revoke_invite_dialog_title">ຍົກເລີກຄຳເຊີນ</string>
+    <string name="phone_book_perform_lookup">ຄົ້ນຫາລາຍຊື່ຕິດຕໍ່ໃນ Matrix</string>
+    <string name="contacts_book_title">ບັນຊີຕິດຕໍ່</string>
+    <string name="empty_contact_book">ປື້ມບັນທຶກການຕິດຕໍ່ຂອງທ່ານຫວ່າງເປົ່າ</string>
+    <string name="loading_contact_book">ກຳລັງດຶງຂໍ້ມູນລາຍຊື່ຜູ່ຕິດຕໍ່ຂອງທ່ານ…</string>
+    <string name="save_recovery_key_chooser_hint">ບັນທຶກລະຫັດການກູ້ຄືນໃນ</string>
+    <string name="disclaimer_positive_button">ຮຽນຮູ້ເພີ່ມເຕີມ</string>
+    <string name="disclaimer_negative_button">ໄດ້ແລ້ວ</string>
+    <string name="disclaimer_content">ພວກເຮົາຮູ້ສຶກຕື່ນເຕັ້ນທີ່ຈະປະກາດວ່າພວກເຮົາໄດ້ປ່ຽນຊື່! ແອັບຂອງທ່ານໄດ້ອັບເດດແລ້ວ ແລະ ທ່ານເຂົ້າສູ່ລະບົບບັນຊີຂອງທ່ານແລ້ວ.</string>
+    <string name="disclaimer_title">Riot ດຽວນີ້ເປັນອົງປະກອບແລ້ວ!</string>
+    <string name="notice_crypto_unable_to_decrypt_merged">ກຳລັງລໍຖ້າປະຫວັດການເຂົ້າລະຫັດ</string>
+    <string name="crypto_error_withheld_generic">ທ່ານບໍ່ສາມາດເຂົ້າເຖິງຂໍ້ຄວາມນີ້ໄດ້ເນື່ອງຈາກຜູ້ສົ່ງບໍ່ໄດ້ສົ່ງກະແຈໃຫ້</string>
+    <string name="crypto_error_withheld_unverified">ທ່ານບໍ່ສາມາດເຂົ້າເຖິງຂໍ້ຄວາມນີ້ໄດ້ເພາະວ່າລະບົບຂອງທ່ານບໍ່ໄດ້ຮັບຄວາມໄວ້ວາງໃຈຈາກຜູ້ສົ່ງ</string>
+    <string name="crypto_error_withheld_blacklisted">ທ່ານບໍ່ສາມາດເຂົ້າເຖິງຂໍ້ຄວາມນີ້ໄດ້ເພາະວ່າທ່ານໄດ້ຖືກບັລອກໂດຍຜູ້ສົ່ງ</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">ເນື່ອງຈາກການເຂົ້າລະຫັດແຕ່ຕົ້ນທາງເຖິງປາຍທາງ, ທ່ານອາດຕ້ອງລໍຖ້າໃຫ້ຂໍ້ຄວາມຂອງຜູ້ໃດຜູ້ໜຶ່ງມາຮອດ ເພາະວ່າກະແຈການເຂົ້າລະຫັດບໍ່ຖືກສົ່ງໃຫ້ທ່ານຢ່າງຖືກຕ້ອງ.</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly">ກຳລັງລໍຖ້າຂໍ້ຄວາມນີ້, ອາດຈະໃຊ້ເວລາຄາວໜຶ່ງ</string>
+    <string name="notice_crypto_unable_to_decrypt_final">ທ່ານບໍ່ສາມາດເຂົ້າເຖິງຂໍ້ຄວາມນີ້ໄດ້</string>
+    <string name="room_settings_set_avatar">ກຳນົດຮູບແທນຕົວ</string>
+    <string name="room_settings_save_success">ທ່ານໄດ້ປ່ຽນການຕັ້ງຄ່າຫ້ອງສຳເລັດແລ້ວ</string>
+    <string name="room_settings_topic_hint">ຫົວຂໍ້</string>
+    <string name="room_settings_name_hint">ຊື່ຫ້ອງ</string>
+    <string name="set_a_security_phrase_again_notice">ກະລຸນາໃສ່ປະໂຫຍກຄວາມປອດໄພຂອງທ່ານອີກຄັ້ງເພື່ອຢືນຢັນ.</string>
+    <string name="set_a_security_phrase_hint">ປະໂຫຍກຄວາມປອດໄພ</string>
+    <string name="set_a_security_phrase_notice">ກະລຸນາໃສ່ປະໂຫຍກຄວາມປອດໄພທີ່ທ່ານຮູ້, ໃຊ້ເພື່ອຮັບປະກັນຄວາມລັບຢູ່ໃນເຊີບເວີຂອງທ່ານ.</string>
+    <string name="set_a_security_phrase_title">ກໍານົດປະໂຫຍກຄວາມປອດໄພ</string>
+    <string name="bottom_sheet_save_your_recovery_key_content">ເກັບຮັກສາກະແຈຄວາມປອດໄພຂອງທ່ານໄວ້ບ່ອນໃດບ່ອນໜຶ່ງທີ່ປອດໄພ, ເຊັ່ນ: ຕົວຈັດການລະຫັດຜ່ານ ຫຼືບ່ອນປອດໄພ.</string>
+    <string name="bottom_sheet_save_your_recovery_key_title">ບັນທຶກກະແຈຄວາມປອດໄພຂອງທ່ານ</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">ກະລຸນາໃສ່ປະໂຫຍກລັບທີ່ທ່ານຮູ້, ແລະສ້າງລະຫັດສໍາລັບການສໍາຮອງຂໍ້ມູນ.</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">ໃຊ້ປະໂຫຍກຄວາມປອດໄພ</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">ສ້າງກະແຈຄວາມປອດໄພເພື່ອເກັບຮັກສາໄວ້ບ່ອນໃດບ່ອນໜຶ່ງທີ່ປອດໄພ ເຊັ່ນ: ຕົວຈັດການລະຫັດຜ່ານ ຫຼືບ່ອນປອດໄພ.</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_title">ໃຊ້ກະແຈຄວາມປອດໄພ</string>
+    <string name="bottom_sheet_setup_secure_backup_submit">ຕັ້ງຄ່າ</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">ປ້ອງກັນການສູນເສຍການເຂົ້າເຖິງຂໍ້ຄວາມ &amp; ຂໍ້ມູນທີ່ຖືກເຂົ້າລະຫັດໂດຍການສໍາຮອງລະຫັດຢູ່ໃນເຊີບເວີຂອງທ່ານ.</string>
+    <string name="bottom_sheet_setup_secure_backup_title">ການສຳຮອງຂໍ້ມູນທີ່ປອດໄພ</string>
+    <string name="a11y_start_camera">ເລີ່ມກ້ອງຖ່າຍຮູບ</string>
+    <string name="a11y_stop_camera">ຢຸດກ້ອງຖ່າຍຮູບ</string>
+    <string name="a11y_unmute_microphone">ເປີດສຽງໄມໂຄຣໂຟນ</string>
+    <string name="a11y_mute_microphone">ປິດສຽງໄມໂຄຣໂຟນ</string>
+    <string name="a11y_open_chat">ເປີດການສົນທະນາ</string>
+    <string name="power_level_title">ບົດບາດ</string>
+    <string name="power_level_edit_title">ກໍານົດພາລະບົດບາດ</string>
+    <string name="identity_server_set_alternative_submit">ສົ່ງ</string>
+    <string name="identity_server_set_alternative_notice_no_default">ກະລຸນາໃສ່ URL ຂອງເຊີບເວີ</string>
+    <string name="identity_server_set_alternative_notice">ອີກທາງເລືອກ, ທ່ານສາມາດໃສ່ URL ຂອງເຊີບເວີອື່ນໆ</string>
+    <string name="identity_server_set_default_submit">ໃຊ້ %1$s</string>
+    <string name="identity_server_set_default_notice">homeserver ຂອງທ່ານ (%1$s) ສະເຫນີໃຫ້ນໍາໃຊ້ %2$s ສໍາລັບ ເຊີບເວີຂອງທ່ານ</string>
+    <string name="identity_server_user_consent_not_provided">ຍັງບໍ່ມີການຍິນຍອມຂອງຜູ້ໃຊ້.</string>
+    <string name="identity_server_error_no_current_binding_error">ບໍ່ມີການເຊື່ອມໂຍງໃນປະຈຸບັນກັບຕົວລະບຸນີ້.</string>
+    <string name="identity_server_error_binding_error">ສະມາຄົມດັ່ງກ່າວບໍ່ສຳເລັດ.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">ເພື່ອຄວາມເປັນສ່ວນຕົວຂອງທ່ານ, ${app_name} ຮອງຮັບແຕ່ການສົ່ງອີເມວ ແລະ ເບີໂທລະສັບຜູ້ໃຊ້ເທົ່ານັ້ນ.</string>
+    <string name="identity_server_error_terms_not_signed">ກ່ອນອື່ນກະລຸນາຍອມຮັບເງື່ອນໄຂຂອງເຊີບເວີໃນການຕັ້ງຄ່າ.</string>
+    <string name="identity_server_error_no_identity_server_configured">ກະລຸນາກຳນົດຄ່າເຊີບເວີກ່ອນ.</string>
+    <string name="identity_server_error_outdated_home_server">ການດໍາເນີນງານນີ້ບໍ່ສາມາດເຮັດໄດ້. homeserver ແມ່ນລ້າສະໄຫມ.</string>
+    <string name="identity_server_error_outdated_identity_server">ເຊີບເວີນີ້ລ້າສະໄໝແລ້ວ. ${app_name} ຮອງຮັບ API V2 ເທົ່ານັ້ນ.</string>
+    <string name="disconnect_identity_server_dialog_content">ຕັດການເຊື່ອມຕໍ່ຈາກເຊີບເວີ %s ບໍ\?</string>
+    <string name="open_terms_of">ເປີດເງື່ອນໄຂຂອງ %s</string>
+    <string name="choose_locale_loading_locales">ກຳລັງໂຫຼດພາສາທີ່ມີ…</string>
+    <string name="choose_locale_other_locales_title">ພາສາອື່ນໆທີ່ມີຢູ່</string>
+    <string name="choose_locale_current_locale_title">ພາສາປັດຈຸບັນ</string>
+    <string name="user_code_info_text">ແບ່ງປັນລະຫັດນີ້ກັບຜູ້ຄົນເພື່ອໃຫ້ເຂົາເຈົ້າສາມາດສະແກນໄດ້ ເພື່ອເພີ່ມທ່ານ ແລະເລີ່ມການສົນທະນາ.</string>
+    <string name="user_code_my_code">ລະຫັດຂອງຂ້ອຍ</string>
+    <string name="settings_account_data">ຂໍ້ມູນບັນຊີ</string>
+    <string name="user_code_share">ແບ່ງປັນລະຫັດຂອງຂ້ອຍ</string>
+    <string name="user_code_scan">ສະແກນ QR code</string>
+    <string name="invite_users_to_room_failure">ພວກເຮົາບໍ່ສາມາດເຊີນຜູ້ໃຊ້ໄດ້. ກະລຸນາກວດເບິ່ງຜູ້ໃຊ້ທີ່ທ່ານຕ້ອງການເຊີນແລ້ວລອງໃໝ່.</string>
+    <plurals name="invitations_sent_to_one_and_more_users">
+        <item quantity="other">ສົ່ງຄຳເຊີນໄປໃຫ້ %1$s ແລະ ອີກ %2$d ຄົນ</item>
+    </plurals>
+    <string name="not_a_valid_qr_code">ບໍ່ແມ່ນລະຫັດ QR matrix ທີ່ຖືກຕ້ອງ</string>
+    <string name="invitations_sent_to_two_users">ສົ່ງຄຳເຊີນໄປຫາ %1$s ແລະ %2$s</string>
+    <string name="invitation_sent_to_one_user">ສົ່ງຄຳເຊີນໄປໃຫ້ %1$s</string>
+    <string name="invite_friends_rich_title">🔐️ ເຂົ້າຮ່ວມກັບຂ້ອຍໃນ ${app_name}</string>
+    <string name="invite_friends_text">ສະບາຍດີ, ລົມກັບຂ້ອຍຢູ່ ${app_name}: %s</string>
+    <string name="invite_friends">ເຊີນເພື່ອນ</string>
+    <string name="invite_users_to_room_title">ເຊີນຜູ້ໃຊ້</string>
+    <string name="inviting_users_to_room">ກຳລັງເຊີນຜູ້ໃຊ້…</string>
+    <string name="invite_users_to_room_action_invite">ເຊີນ</string>
+    <string name="add_people">ເພີ່ມຄົນ</string>
+    <string name="add_members_to_room">ເພີ່ມສະມາຊິກ</string>
+    <string name="create_room_dm_failure">ພວກເຮົາບໍ່ສາມາດສ້າງ DM ຂອງທ່ານໄດ້. ກະລຸນາກວດເບິ່ງຜູ້ໃຊ້ທີ່ທ່ານຕ້ອງການເຊີນແລ້ວລອງໃໝ່.</string>
+    <string name="external_link_confirmation_message">ລິ້ງທີ່ %1$s ກຳລັງພາທ່ານໄປຫາເວັບໄຊອື່ນ: %2$s.
+\n
+\nທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການສືບຕໍ່\?</string>
+    <string name="external_link_confirmation_title">ກວດເບິ່ງລິ້ງນີ້ຄືນໃໝ່</string>
+    <string name="error_forbidden_digits_only_username">homeserver ບໍ່ຍອມຮັບຊື່ຜູ້ໃຊ້ທີ່ມີພຽງແຕ່ຕົວເລກ.</string>
+    <string name="error_empty_field_choose_password">ກະລຸນາເລືອກລະຫັດຜ່ານ.</string>
+    <string name="error_empty_field_choose_user_name">ກະລຸນາເລືອກຊື່ຜູ້ໃຊ້.</string>
+    <string name="failed_to_initialize_cross_signing">ການຕັ້ງຄ່າ Cross Signing ບໍ່ສຳເລັດ</string>
+    <string name="confirm_your_identity_quad_s">ຢືນຢັນຕົວຕົນຂອງທ່ານໂດຍການຢືນຢັນການເຂົ້າສູ່ລະບົບນີ້, ໃຫ້ສິດການເຂົ້າເຖິງຂໍ້ຄວາມທີ່ເຂົ້າລະຫັດ.</string>
+    <string name="confirm_your_identity">ຢືນຢັນຕົວຕົນຂອງທ່ານໂດຍການກວດສອບການເຂົ້າສູ່ລະບົບນີ້ ໂດຍລະບົບອຶ່ນຂອງທ່ານ, ທີ່ໃຫ້ສິດການເຂົ້າເຖິງຂໍ້ຄວາມທີ່ເຂົ້າລະຫັດ.</string>
+    <string name="cross_signing_verify_by_emoji">ຢືນຢັນແບບໂຕ້ຕອບໂດຍອີໂມຈິ</string>
+    <string name="crosssigning_verify_session">ຢືນຢັນການເຂົ້າສູ່ລະບົບ</string>
+    <string name="cross_signing_verify_by_text">ຢືນຢັນຂໍ້ຄວາມດ້ວຍຕົນເອງ</string>
+    <string name="verify_this_session">ຢືນຢັນການເຂົ້າສູ່ລະບົບໃໝ່ທີ່ເຂົ້າເຖິງບັນຊີຂອງທ່ານ: %1$s</string>
+    <string name="verify_other_sessions">ຢັ້ງຢືນທຸກລະບົບຂອງທ່ານເພື່ອໃຫ້ແນ່ໃຈວ່າບັນຊີ ແລະ ຂໍ້ຄວາມຂອງທ່ານປອດໄພ</string>
+    <string name="review_logins">ກວດເບິ່ງບ່ອນທີ່ທ່ານເຂົ້າສູ່ລະບົບ</string>
+    <string name="encrypted_unverified">ເຂົ້າລະຫັດໂດຍອຸປະກອນທີ່ບໍ່ໄດ້ຮັບການຢືນຢັນ</string>
+    <string name="unencrypted">ບໍ່ໄດ້ເຂົ້າລະຫັດ</string>
+    <string name="default_message_emote_snow">ສົ່ງຫິມະຕົກ ❄️</string>
+    <string name="default_message_emote_confetti">ສົ່ງ confetti 🎉</string>
+    <string name="command_snow">ສົ່ງຂໍ້ຄວາມທີ່ກຳນົດດ້ວຍຫິມະຕົກ</string>
+    <string name="command_confetti">ສົ່ງຂໍ້ຄວາມທີ່ກຳນົດດ້ວຍ confetti</string>
+    <plurals name="secure_backup_reset_devices_you_can_verify">
+        <item quantity="other">ສະແດງ %d ອຸປະກອນທີ່ທ່ານສາມາດກວດສອບໄດ້ໃນຕອນນີ້</item>
+    </plurals>
+    <string name="secure_backup_reset_no_history">ທ່ານຈະປິດເປີດໃໝ່ໂດຍບໍ່ມີປະຫວັດ, ບໍ່ມີຂໍ້ຄວາມ, ອຸປະກອນທີ່ເຊື່ອຖືໄດ້ ຫຼື ຜູ້ໃຊ້ທີ່ເຊື່ອຖືໄດ້</string>
+    <string name="secure_backup_reset_if_you_reset_all">ຖ້າຫາກວ່າທ່ານຕັ້ງຄ່າທັງຫມົດ</string>
+    <string name="secure_backup_reset_all_no_other_devices">ເຮັດສິ່ງນີ້ກໍ່ຕໍ່ເມືອທ່ານບໍ່ມີອຸປະກອນອື່ນທີ່ທ່ານສາມາດຢືນຢັນອຸປະກອນນີ້ດ້ວຍ.</string>
+    <string name="secure_backup_reset_all">ຕັ້ງຄ່າຄືນທຸກຢ່າງ</string>
+    <string name="bad_passphrase_key_reset_all_action">ລືມ ຫຼື ສູນເສຍຕົວເລືອກການກູ້ຂໍ້ມູນທັງໝົດບໍ\?ຕັ້ງຄ່າຄືນທຸກຢ່າງ</string>
+    <string name="failed_to_access_secure_storage">ການເຂົ້າເຖິງບ່ອນຈັດເກັບຂໍ້ມູນທີ່ປອດໄພບໍ່ສຳເລັດ</string>
+    <string name="enter_secret_storage_input_key">ເລືອກກະແຈການກູ້ຄືນຂອງທ່ານ, ຫຼື ປ້ອນລະຫັດດ້ວຍຕົນເອງໂດຍການພິມ ຫຼື ວາງຈາກ clipboard ຂອງທ່ານ</string>
+    <string name="use_recovery_key">ໃຊ້ລະຫັດການກູ້ຂໍ້ມູນ</string>
+    <string name="enter_secret_storage_passphrase_or_key">ໃຊ້ %1$s ຂອງທ່ານ ຫຼືໃຊ້ %2$s ຂອງທ່ານເພື່ອສືບຕໍ່.</string>
+    <string name="command_description_discard_session_not_handled">ຮອງຮັບສະເພາະຫ້ອງທີ່ເຂົ້າລະຫັດໄວ້</string>
+    <string name="command_description_discard_session">ບັງຄັບໃຫ້ຍົກເລີກຈາກລະບົບກຸ່ມຂາອອກໃນປະຈຸບັນໃນຫ້ອງທີ່ເຂົ້າລະຫັດ</string>
+    <string name="use_latest_app">ໃຊ້ ${app_name} ລ່າສຸດໃນອຸປະກອນອື່ນຂອງທ່ານ:</string>
+    <string name="or_other_mx_capable_client">ຫຼື ລູກຄ້າ Matrix ທີ່ສາມາດcross-signing ໄດ້</string>
+    <string name="app_ios_android">${app_name} iOS
+\n${app_name} Android</string>
+    <string name="app_desktop_web">${app_name} Web
+\n${app_name} Desktop</string>
+    <string name="use_other_session_content_description">ໃຊ້ ${app_name} ລ່າສຸດໃນອຸປະກອນອື່ນຂອງທ່ານ, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} ສໍາລັບ Android, ຫຼື ລູກຄ້າ Matrix ອື່ນທີ່ສາມາດ cross-signing ໄດ້</string>
+    <string name="change_password_summary">ຕັ້ງລະຫັດຜ່ານບັນຊີໃໝ່…</string>
+    <string name="error_saving_media_file">ບໍ່ສາມາດບັນທຶກໄຟລ໌ມີເດຍໄດ້</string>
+    <string name="settings_security_prevent_screenshots_summary">ການເປີດໃຊ້ງານການຕັ້ງຄ່ານີ້ຈະເພີ່ມ FLAG_SECURE ໃສ່ກິດຈະກຳທັງໝົດ. ການຕັ້ງຄ່າຄືນໃໝ່ແອັບພລິເຄຊັນເພື່ອໃຫ້ການປ່ຽນແປງ.</string>
+    <string name="settings_security_prevent_screenshots_title">ປ້ອງກັນພາບໜ້າຈໍຂອງແອັບພລິເຄຊັນ</string>
+    <string name="bootstrap_migration_backup_recovery_key">ລະຫັດສຳຮອງການກູ້ຄືນກະແຈ</string>
+    <string name="bootstrap_migration_with_passphrase_helper_with_link">ບໍ່ຮູ້ລະຫັດສຳຮອງຂອງທ່ານ, ທ່ານສາມາດ %s ໄດ້.</string>
+    <string name="bootstrap_migration_use_recovery_key">ໃຊ້ລະຫັດການກູ້ຄືນ ກະເເຈ/ລະຫັດສຳຮອງຂອງທ່ານ</string>
+    <string name="bootstrap_migration_enter_backup_password">ໃສ່ລະຫັດການສຳຮອງຂໍ້ມູນຂອງທ່ານເພື່ອດຳເນີນການຕໍ່ໄປ.</string>
+    <string name="bootstrap_progress_storing_in_sss">ການເກັບຮັກສາລະຫັດລັບໃນ SSSS</string>
+    <string name="bootstrap_progress_generating_ssss_recovery">ກຳລັງສ້າງລະຫັດ SSSS ຈາກລະຫັດການກູ້ຂໍ້ມູນ</string>
+    <string name="bootstrap_progress_generating_ssss_with_info">ກຳລັງສ້າງລະຫັດ SSSS ຈາກປະໂຫຍດລະຫັດຜ່ານ (%s)</string>
+    <string name="bootstrap_progress_generating_ssss">ກຳລັງສ້າງລະຫັດ SSSS ຈາກຂໍ້ຄວາມປະໂຫຍກລະຫັດຜ່ານ</string>
+    <string name="bootstrap_progress_compute_curve_key">ກຳລັງຂໍລະຫັດເສັ້ນໂຄ້ງ</string>
+    <string name="bootstrap_progress_checking_backup_with_info">ກຳລັງກວດສອບລະຫັດສຳຮອງ (%s)</string>
+    <string name="bootstrap_progress_checking_backup">ກຳລັງກວດສອບລະຫັດສຳຮອງ</string>
+    <string name="recovery_key_empty_error_message">ກະລຸນາໃສ່ລະຫັດການກູ້ຂໍ້ມູນ</string>
+    <string name="bootstrap_invalid_recovery_key">ບໍ່ແມ່ນລະຫັດການກູ້ຂໍ້ມູນທີ່ຖືກຕ້ອງ</string>
+    <string name="use_file">ໃຊ້ File</string>
+    <string name="bootstrap_enter_recovery">ໃສ່ %s ຂອງທ່ານເພື່ອສືບຕໍ່</string>
+    <string name="security_prompt_text">ຢັ້ງຢືນຕົວທ່ານເອງ ແລະ ຄົນອື່ນເພື່ອຮັກສາການສົນທະນາຂອງທ່ານໃຫ້ປອດໄພ</string>
+    <string name="upgrade_security">ມີການຍົກລະດັບການເຂົ້າລະຫັດ</string>
+    <string name="room_message_placeholder">ຂໍ້ຄວາມ…</string>
+    <string name="auth_invalid_login_deactivated_account">ບັນຊີນີ້ຖືກປິດການໃຊ້ງານແລ້ວ.</string>
+    <string name="auth_invalid_login_param_space_in_password">ຊື່ຜູ້ໃຊ້ ແລະ/ຫຼືລະຫັດຜ່ານບໍ່ຖືກຕ້ອງ. ລະຫັດຜ່ານທີ່ປ້ອນເຂົ້າເລີ່ມຕົ້ນຫຼືລົງທ້າຍດ້ວຍການຍະຫວ່າງ, ກະລຸນາກວດສອບມັນ.</string>
+    <string name="command_description_plain">ສົ່ງຂໍ້ຄວາມເປັນຂໍ້ຄວາມທຳມະດາ, ໂດຍບໍ່ມີການຕີຄວາມໝາຍວ່າເປັນເຄື່ອງໝາຍmarkdown</string>
+    <string name="settings_troubleshoot_title">ແກ້ໄຂບັນຫາ</string>
+    <string name="settings_notification_configuration">ການຕັ້ງຄ່າການແຈ້ງເຕືອນ</string>
+    <string name="error_failed_to_import_keys">ການນໍາເຂົ້າລະຫັດບໍ່ສຳເລັດ</string>
+    <string name="qr_code_scanned_verif_waiting">ກຳລັງລໍຖ້າ %s…</string>
+    <string name="qr_code_scanned_verif_waiting_notice">ເກືອບຈະແລ້ວ! ກຳລັງລໍຖ້າການຢືນຢັນ…</string>
+    <string name="qr_code_scanned_self_verif_notice">ເກືອບຈະ! ອຸປະກອນອື່ນສະແດງຫມາຍຖືກບໍ\?</string>
+    <string name="topic_prefix">"ຫົວຂໍ້: "</string>
+    <string name="add_a_topic_link_text">ເພີ່ມຫົວຂໍ້</string>
+    <string name="room_created_summary_no_topic_creation_text">%s ເພື່ອແຈ້ງໃຫ້ຄົນຮູ້ວ່າຫ້ອງນີ້ແມ່ນຫຍັງ.</string>
+    <string name="this_is_the_beginning_of_dm">ນີ້ແມ່ນຈຸດເລີ່ມຕົ້ນຂອງປະຫວັດຂໍ້ຄວາມໂດຍກົງຂອງທ່ານກັບ %s.</string>
+    <string name="this_is_the_beginning_of_room_no_name">ນີ້ແມ່ນຈຸດເລີ່ມຕົ້ນຂອງການສົນທະນານີ້.</string>
+    <string name="this_is_the_beginning_of_room">ນີ້ແມ່ນຈຸດເລີ່ມຕົ້ນຂອງ %s.</string>
+    <string name="direct_room_created_summary_item_by_you">ທ່ານໄດ້ເຂົ້າຮ່ວມແລ້ວ.</string>
+    <string name="direct_room_created_summary_item">%s ເຂົ້າຮ່ວມ.</string>
+    <string name="room_created_summary_item_by_you">ທ່ານສ້າງ ແລະ ກຳນົດຄ່າຫ້ອງ.</string>
+    <string name="room_created_summary_item">%s ສ້າງ ແລະ ກຳນົດຄ່າຫ້ອງ.</string>
+    <string name="encryption_unknown_algorithm_tile_description">ບໍ່ຮອງຮັບການເຂົ້າລະຫັດທີ່ໃຊ້ໃນຫ້ອງນີ້</string>
+    <string name="encryption_misconfigured">ການເຂົ້າລະຫັດຖືກຕັ້ງຄ່າຜິດ</string>
+    <string name="encryption_not_enabled">ບໍ່ໄດ້ເປີດໃຊ້ງານການເຂົ້າລະຫັດ</string>
+    <string name="direct_room_encryption_enabled_tile_description">ຂໍ້ຄວາມຢູ່ໃນຫ້ອງນີ້ຖືກເຂົ້າລະຫັດແຕ່ຕົ້ນທາງຮອດປາຍທາງ.</string>
+    <string name="encryption_enabled_tile_description">ຂໍ້ຄວາມຢູ່ໃນຫ້ອງນີ້ຖືກເຂົ້າລະຫັດແຕ່ຕົ້ນທາງຮອດປາຍທາງ. ສຶກສາເພີ່ມເຕີມ ແລະ ຢັ້ງຢືນຜູ້ໃຊ້ໃນໂປຣໄຟລ໌ຂອງເຂົາເຈົ້າ.</string>
+    <string name="encryption_enabled">ເປີດໃຊ້ງານການເຂົ້າລະຫັດແລ້ວ</string>
+    <string name="bootstrap_cancel_text">ຖ້າທ່ານຍົກເລີກຕອນນີ້, ທ່ານອາດຈະສູນເສຍຂໍ້ຄວາມ &amp; ຂໍ້ມູນທີ່ຖືກເຂົ້າລະຫັດ ຖ້າຫາກທ່ານສູນເສຍການເຂົ້າເຖິງການເຂົ້າສູ່ລະບົບຂອງທ່ານ.
+\n
+\nນອກນັ້ນທ່ານຍັງສາມາດຕັ້ງຄ່າການສໍາຮອງຂໍ້ມູນທີ່ປອດໄພ &amp; ຈັດການກະແຈຂອງທ່ານໃນການຕັ້ງຄ່າ.</string>
+    <plurals name="room_profile_section_more_member_list">
+        <item quantity="other">%1$dຜູ້ຄົນ</item>
+    </plurals>
+    <string name="room_profile_section_more_notifications">ການແຈ້ງເຕືອນ</string>
+    <string name="direct_room_profile_section_more_settings">ການຕັ້ງຄ່າ</string>
+    <string name="room_profile_section_more_settings">ການຕັ້ງຄ່າຫ້ອງ</string>
+    <string name="room_profile_section_admin">ການດຳເນິນການຂອງຜູ້ເບິ່ງແຍງ</string>
+    <string name="room_profile_section_more">ເພີ່ມເຕີມ</string>
+    <string name="room_profile_section_security_learn_more">ສຶກສາເພີ່ມເຕີມ</string>
+    <string name="room_profile_section_restore_security">ການກູ້ຄືນການເຂົ້າລະຫັດ</string>
+    <string name="room_profile_section_security">ຄວາມປອດໄພ</string>
+    <string name="direct_room_profile_encrypted_subtitle">ຂໍ້ຄວາມນີ້ຖືກເຂົ້າລະຫັດແຕ່ຕົ້ນທາງຮອດປາຍທາງ.
+\n
+\nຂໍ້ຄວາມຂອງທ່ານຖືກລັອກໄວ້ຢ່າງປອດໄພ ແລະ ມີພຽງແຕ່ທ່ານ ແລະ ຜູ້ຮັບເທົ່ານັ້ນທີ່ມີກະແຈສະເພາະເພື່ອປົດລັອກພວກມັນ.</string>
+    <string name="contact_admin_to_restore_encryption">ກະລຸນາຕິດຕໍ່ຜູ້ເບິ່ງແຍງເພື່ອກູ້ຄືນການເຂົ້າລະຫັດໃຫ້ເປັນສະຖານະທີ່ຖືກຕ້ອງ.</string>
+    <string name="encryption_has_been_misconfigured">ການເຂົ້າລະຫັດໄດ້ກຳນົດຄ່າຜິດ.</string>
+    <string name="room_profile_encrypted_subtitle">ຂໍ້ຄວາມຢູ່ໃນຫ້ອງນີ້ຖືກເຂົ້າລະຫັດແບບຕົ້ນທາງຮອດປາຍທາງ.
+\n
+\nຂໍ້ຄວາມຂອງທ່ານຖືກລັອກໄວ້ຢ່າງປອດໄພ ແລະ ມີພຽງແຕ່ທ່ານ ແລະ ຜູ້ຮັບເທົ່ານັ້ນທີ່ມີກະແຈສະເພາະເພື່ອປົດລັອກພວກມັນ.</string>
+    <string name="direct_room_profile_not_encrypted_subtitle">ຂໍ້ຄວາມນີ້ບໍ່ໄດ້ເຂົ້າລະຫັດແຕ່ຕົ້ນທາງເຸຖິງປາຍທາງ.</string>
+    <string name="room_profile_not_encrypted_subtitle">ຂໍ້ຄວາມຢູ່ໃນຫ້ອງນີ້ບໍ່ໄດ້ຖືກເຂົ້າລະຫັດແບບຕົ້ນທາງເຖິງປາຍທາງ.</string>
+    <string name="verification_request_waiting_for">ກຳລັງລໍຖ້າ %s…</string>
+    <string name="verification_verified_user">ຢືນຢັນແລ້ວ %s</string>
+    <string name="verification_verify_user">ຢືນຢັນ %s</string>
+    <string name="verification_no_scan_emoji_title">ກວດສອບໂດຍການປຽບທຽບ emojis</string>
+    <string name="verification_scan_self_emoji_subtitle">ຢັ້ງຢືນໂດຍການປຽບທຽບ emoji ແທນ</string>
+    <string name="verification_scan_emoji_subtitle">ຖ້າທ່ານບໍ່ໄດ້ຢູ່ໃນຕໍ່ໜ້າ, ໃຫ້ປຽບທຽບ emoji ແທນ</string>
+    <string name="verification_scan_emoji_title">ບໍ່ສາມາດສະແກນໄດ້</string>
+    <string name="verification_scan_with_this_device">ສະແກນດ້ວຍອຸປະກອນນີ້</string>
+    <string name="verification_scan_their_code">ສະແກນລະຫັດຂອງພວກເຂົາ</string>
+    <string name="verification_scan_self_notice">ສະແກນລະຫັດດ້ວຍອຸປະກອນອື່ນຂອງທ່ານ ຫຼື ສະຫຼັບ ແລະສະແກນດ້ວຍອຸປະກອນນີ້</string>
+    <string name="verification_scan_notice">ສະແກນລະຫັດກັບອຸປະກອນຂອງຜູ້ໃຊ້ອື່ນເພື່ອຢືນຢັນກັນຢ່າງປອດໄພ</string>
+    <string name="verification_verify_device">ຢືນຢັນລະບົບນີ້</string>
+    <string name="verification_request">ການຮ້ອງຂໍການຢັ້ງຢືນ</string>
+    <string name="verification_sent">ສົ່ງການຢັ້ງຢືນແລ້ວ</string>
+    <string name="verification_request_you_accepted">ທ່ານຍອມຮັບ</string>
+    <string name="verification_request_other_accepted">%s ຍອມຮັບ</string>
+    <string name="verification_request_you_cancelled">ທ່ານໄດ້ຍົກເລີກ</string>
+    <string name="verification_request_other_cancelled">%s ຖືກຍົກເລີກ</string>
+    <string name="verification_request_waiting">ກຳລັງລໍຖ້າ…</string>
+    <string name="sent_live_location">ແບ່ງປັນສະຖານທີ່ປັດຈຸບັນຂອງເຂົາເຈົ້າ</string>
+    <string name="sent_location">ແບ່ງປັນສະຖານທີ່ຂອງເຂົາເຈົ້າ</string>
+    <string name="sent_verification_conclusion">ສະຫຼຸບການຢັ້ງຢືນ</string>
+    <string name="sent_a_reaction">ຕອບສະໜອງດ້ວຍ: %s</string>
+    <string name="sent_a_poll">ການສໍາຫຼວດ</string>
+    <string name="send_a_sticker">ສະຕິກເກີ</string>
+    <string name="sent_a_file">ໄຟລ໌</string>
+    <string name="sent_a_voice_message">ສຽງ</string>
+    <string name="sent_an_audio_file">ສຽງ</string>
+    <string name="sent_an_image">ຮູບພາບ.</string>
+    <string name="sent_a_video">ວິດີໂອ.</string>
+    <string name="verification_conclusion_compromised">"ຫນຶ່ງໃນຕໍ່ໄປນີ້ອາດຈະຖືກທໍາລາຍ:
+\n
+\n  - homeserver ຂອງທ່ານ
+\n  - homeserver ທີ່ຜູ້ໃຊ້ທີ່ທ່ານກໍາລັງກວດສອບແມ່ນໄດ້ເຊື່ອມຕໍ່ກັບ
+\n  - ຂອງທ່ານ, ຫຼື ການເຊື່ອມຕໍ່ອິນເຕີເນັດຂອງຜູ້ໃຊ້ອື່ນໆ
+\n  - ຂອງທ່ານ, ຫຼື ອຸປະກອນຂອງຜູ້ໃຊ້ອື່ນ"</string>
+    <string name="verification_conclusion_not_secure">ບໍ່ປອດໄພ</string>
+    <string name="verification_sas_do_not_match">ບໍ່ກົງກັນ</string>
+    <string name="verification_sas_match">ກົງກັນ</string>
+    <string name="verification_conclusion_warning">ເຂົ້າສູ່ລະບົບທີ່ບໍ່ໜ້າເຊື່ອຖື</string>
+    <string name="login_error_threepid_denied">ໂດເມນອີເມວຂອງທ່ານບໍ່ໄດ້ຮັບອະນຸຍາດໃຫ້ລົງທະບຽນຢູ່ໃນເຊີບເວີນີ້</string>
+    <string name="create_space_in_progress">ກຳລັງສ້າງພື້ນທີ່…</string>
+    <string name="create_room_in_progress">ກຳລັງສ້າງຫ້ອງ…</string>
+    <string name="create_room_alias_invalid">ບໍ່ອະນຸຍາດໃຫ້ໃຊ້ອັກສອນບາງຕົວ</string>
+    <string name="create_room_alias_empty">ກະລຸນາລະບຸທີ່ຢູ່ຫ້ອງ</string>
+    <string name="create_room_alias_already_in_use">ທີ່ຢູ່ນີ້ຖືກໃຊ້ແລ້ວ</string>
+    <string name="create_space_alias_hint">ທີ່ຢູ່ຂອງພຶ້ນທີ່</string>
+    <string name="create_room_disable_federation_description">ທ່ານອາດຈະເປີດໃຊ້ງານຖ້າຫ້ອງຈະຖືກໃຊ້ເພື່ອຮ່ວມມືກັບທີມງານພາຍໃນໃນເຊີບເວີຂອງທ່ານເທົ່ານັ້ນ. ອັນນີ້ບໍ່ສາມາດປ່ຽນແປງໄດ້ໃນພາຍຫຼັງ.</string>
+    <string name="create_room_disable_federation_title">ຫ້າມຜູ້ໃດຜູ້ໜຶ່ງທີ່ບໍ່ໄດ້ເປັນສ່ວນຫນຶ່ງຂອງ %s ຈາກການເຂົ້າຮ່ວມຫ້ອງນີ້</string>
+    <string name="hide_advanced">ເຊື່ອງຂັ້ນສູງ</string>
+    <string name="show_advanced">ສະແດງຂັ້ນສູງ</string>
+    <string name="create_room_encryption_description">ເມື່ອເປີດໃຊ້ແລ້ວ, ການເຂົ້າລະຫັດບໍ່ສາມາດຖືກປິດໃຊ້ງານໄດ້.</string>
+    <string name="create_room_encryption_title">ເປີດໃຊ້ການເຂົ້າລະຫັດ</string>
+    <string name="command_description_lenny">ເພິ່ມ( ͡° ͜ʖ ͡°) ຂ້າງໜ້າຂໍ້ຄວາມທຳມະດາ</string>
+    <string name="command_description_shrug">ເພິ່ມ ¯\\_(ツ)_/¯ຂ້າງໜ້າຂໍ້ຄວາມທໍາມະດາ</string>
+    <string name="settings_developer_mode_show_info_on_screen_summary">ສະແດງຂໍ້ມູນທີ່ເປັນປະໂຫຍດເພື່ອຊ່ວຍແກ້ບັນຫາແອັບພລິເຄຊັນ</string>
+    <string name="settings_developer_mode_show_info_on_screen_title">ສະແດງຂໍ້ມູນການແກ້ໃຂໃນໜ້າຈໍ</string>
+    <string name="settings_developer_mode_fail_fast_summary">${app_name} ອາດຈະຂັດຂ້ອງເລື້ອຍໆເມື່ອມີຄວາມຜິດພາດທີ່ບໍ່ຄາດຄິດເກີດຂຶ້ນ</string>
+    <string name="settings_developer_mode_fail_fast_title">ບໍ່ສຳເລັດ</string>
+    <string name="autocomplete_limited_results">ສະແດງສະເພາະຜົນໄດ້ຮັບທຳອິດ, ພິມຕົວອັກສອນເພີ່ມເຕີມ…</string>
+    <string name="devices_other_devices">ລະບົບອື່ນໆ</string>
+    <string name="devices_current_device">ລະບົບປະຈຸບັນ</string>
+    <string name="settings">ການຕັ້ງຄ່າ</string>
+    <string name="rageshake_detected">ກວດພົບການສັ່ນ!</string>
+    <string name="settings_rageshake_detection_threshold_summary">ສັ່ນໂທລະສັບຂອງທ່ານເພື່ອທົດສອບເກນການກວດຫາ</string>
+    <string name="settings_rageshake_detection_threshold">ການກວດຫາ</string>
+    <string name="settings_rageshake">Rageshake</string>
+    <string name="settings_developer_mode_summary">ໂໝດຜູ້ພັດທະນາເປີດໃຊ້ຄຸນສົມບັດທີ່ເຊື່ອງໄວ້ ແລະ ອາດຈະເຮັດໃຫ້ແອັບພລິເຄຊັນມີຄວາມໝັ້ນຄົງໜ້ອຍລົງ. ສໍາລັບນັກພັດທະນາເທົ່ານັ້ນ!</string>
+    <string name="settings_developer_mode">ຮູບແບບນັກພັດທະນາ</string>
+    <string name="settings_advanced_settings">ຕັ້ງຄ່າຂັ້ນສູງ</string>
+    <string name="notification_initial_sync">ການຊິງຄ໌ເບື້ອງຕົ້ນ…</string>
+    <string name="bug_report_error_too_short">ຄຳອະທິບາຍສັ້ນເກີນໄປ</string>
+    <string name="permalink_malformed">ລິ້ງ matrix.to ຂອງທ່ານບໍ່ຖືກຕ້ອງ</string>
+    <string name="soft_logout_sso_not_same_user_error">ລະບົບປັດຈຸບັນແມ່ນສໍາລັບຜູ້ໃຊ້ %1$s ແລະ ທ່ານໃຫ້ຂໍ້ມູນປະຈໍາຕົວສໍາລັບຜູ້ໃຊ້ %2$s. ອັນນີ້ບໍ່ຮອງຮັບໂດຍ ${app_name}.
+\nກະລຸນາລຶບຂໍ້ມູນກ່ອນ, ຈາກນັ້ນເຂົ້າສູ່ລະບົບອີກຄັ້ງໃນບັນຊີອື່ນ.</string>
+    <string name="soft_logout_clear_data_dialog_e2e_warning_content">ທ່ານຈະສູນເສຍການເຂົ້າເຖິງຂໍ້ຄວາມທີ່ປອດໄພເວັ້ນເສຍແຕ່ວ່າທ່ານເຂົ້າສູ່ລະບົບເພື່ອກູ້ຄືນການເຂົ້າລະຫັດຂອງທ່ານ.</string>
+    <string name="soft_logout_clear_data_dialog_content">ລຶບລ້າງຂໍ້ມູນທັງໝົດທີ່ເກັບໄວ້ໃນອຸປະກອນນີ້ບໍ\?
+\nເຂົ້າສູ່ລະບົບອີກຄັ້ງເພື່ອເຂົ້າເຖິງຂໍ້ມູນບັນຊີ ແລະ ຂໍ້ຄວາມຂອງທ່ານ.</string>
+    <string name="soft_logout_clear_data_dialog_title">ລຶບລ້າງຂໍ້ມູນ</string>
+    <string name="soft_logout_clear_data_submit">ລຶບລ້າງຂໍ້ມູນທັງໝົດ</string>
+    <string name="soft_logout_clear_data_notice">ຄຳເຕືອນ: ຂໍ້ມູນສ່ວນຕົວຂອງທ່ານ (ລວມທັງກະແຈການເຂົ້າລະຫັດ) ຍັງຖືກເກັບໄວ້ໃນອຸປະກອນນີ້.
+\n
+\nລຶບລ້າງຫາກທ່ານໃຊ້ອຸປະກອນນີ້ແລ້ວ, ຫຼືຕ້ອງການເຂົ້າສູ່ລະບົບບັນຊີອື່ນ.</string>
+    <string name="soft_logout_clear_data_title">ລຶບຂໍ້ມູນສ່ວນຕົວ</string>
+    <string name="soft_logout_signin_password_hint">ລະຫັດຜ່ານ</string>
+    <string name="soft_logout_signin_submit">ເຂົ້າສູ່ລະບົບ</string>
+    <string name="soft_logout_signin_e2e_warning_notice">ເຂົ້າສູ່ລະບົບເພື່ອກູ້ການເຂົ້າລະຫັດທີ່ເກັບໄວ້ໃນອຸປະກອນນີ້ເທົ່ານັ້ນ. ທ່ານຕ້ອງການໃຫ້ພວກເຂົາອ່ານຂໍ້ຄວາມທີ່ປອດໄພທັງໝົດຂອງທ່ານໃນອຸປະກອນໃດກໍໄດ້.</string>
+    <string name="soft_logout_signin_notice">ຜູ້ເບິ່ງແຍງລະບົບ homeserver (%1$s) ຂອງທ່ານໄດ້ນຳທ່ານອອກຈາກລະບົບບັນຊີ %2$s (%3$s).</string>
+    <string name="soft_logout_signin_title">ເຂົ້າສູ່ລະບົບ</string>
+    <string name="soft_logout_title">ທ່ານອອກຈາກລະບົບແລ້ວ</string>
+    <string name="signed_out_submit">ເຂົ້າສູ່ລະບົບອີກຄັ້ງ</string>
+    <string name="signed_out_notice">ອາດເກີດຈາກເຫດຜົນຕ່າງໆ:
+\n
+\n• ທ່ານໄດ້ປ່ຽນລະຫັດຜ່ານຂອງທ່ານໃນລະບົບອື່ນ.
+\n
+\n• ທ່ານໄດ້ລຶບລະບົບນີ້ອອກຈາກລະບົບອື່ນແລ້ວ.
+\n
+\n• ຜູ້ເບິ່ງແຍງລະບົບເຊີບເວີຂອງທ່ານໄດ້ຍົກເລີກການເຂົ້າເຖິງຂອງທ່ານດ້ວຍເຫດຜົນດ້ານຄວາມປອດໄພ.</string>
+    <string name="signed_out_title">ທ່ານອອກຈາກລະບົບແລ້ວ</string>
+    <string name="seen_by">ເຫັນໂດຍ</string>
+    <string name="autodiscover_well_known_error">ບໍ່ສາມາດຊອກຫາ homeserver ທີ່ຖືກຕ້ອງໄດ້. ກະລຸນາກວດເບິ່ງຕົວລະບຸຂອງທ່ານ</string>
+    <string name="login_signin_matrix_id_error_invalid_matrix_id">ນີ້ບໍ່ແມ່ນຕົວລະບຸຜູ້ໃຊ້ທີ່ຖືກຕ້ອງ. ຮູບແບບທີ່ຄາດໄວ້: \'@user:homeserver.org\'</string>
+    <string name="login_signin_matrix_id_password_notice">ຖ້າທ່ານບໍ່ຮູ້ລະຫັດຜ່ານຂອງທ່ານ, ໃຫ້ກັບຄືນໄປຕັ້ງຄ່າໃໝ່.</string>
+    <string name="login_signin_matrix_id_hint">Matrix ID</string>
+    <string name="login_signin_matrix_id_notice">ຖ້າທ່ານຕັ້ງບັນຊີຢູ່ໃນ homeserver, ໃຊ້ Matrix ID ຂອງທ່ານ (ເຊັ່ນ: @user:domain.com) ແລະລະຫັດຜ່ານຂ້າງລຸ່ມນີ້.</string>
+    <string name="login_signin_matrix_id_title">ເຂົ້າສູ່ລະບົບດ້ວຍ Matrix ID</string>
+    <string name="login_connect_using_matrix_id_submit">ເຂົ້າສູ່ລະບົບດ້ວຍ Matrix ID</string>
+    <plurals name="login_error_limit_exceeded_retry_after">
+        <item quantity="other">ສົ່ງຄຳຮ້ອງຂໍຫຼາຍເກີນໄປ. ທ່ານສາມາດລອງໃໝ່ໃນອີກ %1$d ວິນາທີ…</item>
+    </plurals>
+    <string name="login_error_outdated_homeserver_warning_content">homeserverນີ້ກຳລັງໃຊ້ເວີຊັນເກົ່າ. ຂໍໃຫ້ຜູ້ເບິ່ງແຍງເຊີບເວີຂອງທ່ານຍົກລະດັບເວີຊັ້ນ. ທ່ານສາມາດສືບຕໍ່ໄດ້, ແຕ່ບາງຄຸນສົມບັດອາດຈະເຮັດວຽກບໍ່ຖືກຕ້ອງ.</string>
+    <string name="login_error_outdated_homeserver_title">homeserver ລ້າສະໄຫມ</string>
+    <string name="login_validation_code_is_not_correct">ລະຫັດທີ່ໃສ່ນັ້ນບໍ່ຖືກຕ້ອງ. ກະລຸນາກວດສອບ.</string>
+    <string name="login_wait_for_email_notice">ພວກເຮົາຫາກໍສົ່ງອີເມວຫາ %1$s.
+\nກະລຸນາກົດໃສ່ການເຊື່ອມຕໍ່ທີ່ມີເພື່ອສືບຕໍ່ການສ້າງບັນຊີ.</string>
+    <string name="login_wait_for_email_title">ກະລຸນາກວດເບິ່ງອີເມວຂອງທ່ານ</string>
+    <string name="login_terms_title">ຍອມຮັບເງື່ອນໄຂເພື່ອສືບຕໍ່</string>
+    <string name="login_a11y_captcha_container">ກະລຸນາດໍາເນີນການ captcha</string>
+    <string name="login_a11y_choose_other">ເລືອກ homeserver ແບບກຳນົດເອງ</string>
+    <string name="login_a11y_choose_modular">ເລືອກບໍລິການ Element Matrix</string>
+    <string name="login_a11y_choose_matrix_org">ເລືອກ matrix.org</string>
+    <string name="login_signup_cancel_confirmation_content">ທ່ານຍັງບໍ່ໄດ້ສ້າງບັນຊີເທື່ອ.
+\n
+\nຢຸດຂະບວນການລົງທະບຽນ\?</string>
+    <string name="login_signup_cancel_confirmation_title">ຄຳເຕືອນ</string>
+    <string name="login_signup_error_user_in_use">ຊື່ຜູ້ໃຊ້ນັ້ນຖືກໃຊ້ແລ້ວ</string>
+    <string name="login_signup_submit">ຕໍ່ໄປ</string>
+    <string name="login_signup_password_hint">ລະຫັດຜ່ານ</string>
+    <string name="login_signup_username_hint">ຊື່ຜູ້ໃຊ້</string>
+    <string name="login_signin_username_hint">ຊື່ຜູ້ໃຊ້ ຫຼື ອີເມລ</string>
+    <string name="login_signup_to">ລົງທະບຽນສູງສຸດ %1$s</string>
+    <string name="login_msisdn_error_other">ເບີໂທລະສັບເບິ່ງຄືວ່າບໍ່ຖືກຕ້ອງ. ກະລຸນາກວດເບິ່ງມັນ</string>
+    <string name="login_msisdn_error_not_international">ບີໂທລະສັບສາກົນຕ້ອງເລີ່ມຕົ້ນດ້ວຍ \'+\'</string>
+    <string name="login_msisdn_notice">ກະລຸນາໃຊ້ຮູບແບບສາກົນ (ເບີໂທລະສັບຕ້ອງຂຶ້ນຕົ້ນດ້ວຍ \'+\')</string>
+    <string name="login_msisdn_confirm_submit">ຕໍ່ໄປ</string>
+    <string name="login_msisdn_confirm_send_again">ສົ່ງອີກຄັ້ງ</string>
+    <string name="login_msisdn_confirm_hint">ໃສ່ລະຫັດ</string>
+    <string name="login_msisdn_confirm_notice">ພວກເຮົາຫາກໍສົ່ງລະຫັດໄປໃຫ້ %1$s. ປ້ອນໃສ່ທາງລຸ່ມເພື່ອຢັ້ງຢືນວ່າມັນແມ່ນທ່ານ.</string>
+    <string name="login_msisdn_confirm_title">ຢືນຢັນເບີໂທລະສັບ</string>
+    <string name="login_set_msisdn_submit">ຕໍ່ໄປ</string>
+    <string name="login_set_msisdn_optional_hint">ເບີໂທລະສັບ (ທາງເລືອກ)</string>
+    <string name="login_set_msisdn_mandatory_hint">ເບີໂທລະສັບ</string>
+    <string name="login_set_msisdn_notice2">ກະລຸນາໃຊ້ຮູບແບບສາກົນ.</string>
+    <string name="login_set_msisdn_notice">ກຳນົດເບີໂທລະສັບເພື່ອອະນຸຍາດໃຫ້ຄົນທີ່ທ່ານຮູ້ຈັກຄົ້ນຫາທ່ານ.</string>
+    <string name="login_set_msisdn_title">ຕັ້ງເບີໂທລະສັບ</string>
+    <string name="does_not_look_like_valid_email">ເບິ່ງຄືວ່າທີ່ຢູ່ອີເມວບໍ່ຖືກຕ້ອງ</string>
+    <string name="login_set_email_submit">ຕໍ່ໄປ</string>
+    <string name="login_set_email_optional_hint">ອີເມວ (ທາງເລືອກ)</string>
+    <string name="login_set_email_mandatory_hint">ອີເມວ</string>
+    <string name="login_set_email_notice">ຕັ້ງອີເມວເພື່ອກູ້ຄືນບັນຊີຂອງທ່ານ. ພາຍຫຼັງ, ທ່ານສາມາດເລືອກໃຫ້ຄົນທີ່ທ່ານຮູ້ຈັກຄົ້ນຫາທ່ານທາງອີເມວຂອງທ່ານ.</string>
+    <string name="login_set_email_title">ຕັ້ງທີ່ຢູ່ອີເມວ</string>
+    <string name="login_reset_password_cancel_confirmation_content">ລະຫັດຜ່ານຂອງທ່ານຍັງບໍ່ທັນມີການປ່ຽນແປງ.
+\n
+\nຢຸດຂະບວນການປ່ຽນລະຫັດຜ່ານບໍ\?</string>
+    <string name="login_reset_password_cancel_confirmation_title">ຄຳເຕືອນ</string>
+    <string name="login_reset_password_success_submit">ກັບຄືນສູ່ເຂົ້າສູ່ລະບົບ</string>
+    <string name="login_reset_password_success_notice_2">ທ່ານໄດ້ອອກຈາກລະບົບທັງໝົດ ແລະຈະບໍ່ໄດ້ຮັບການແຈ້ງເຕືອນ push ອີກຕໍ່ໄປ. ເພື່ອເປີດໃຊ້ການແຈ້ງເຕືອນຄືນໃໝ່, ກະລຸນາເຂົ້າສູ່ລະບົບອີກຄັ້ງໃນແຕ່ລະອຸປະກອນ.</string>
+    <string name="login_reset_password_success_notice">ລະຫັດຜ່ານຂອງທ່ານໄດ້ຖືກຕັ້ງຄ່າແລ້ວ.</string>
+    <string name="login_reset_password_success_title">ຄວາມສໍາເລັດ!</string>
+    <string name="login_reset_password_mail_confirmation_submit">ຂ້ອຍໄດ້ຢືນຢັນທີ່ຢູ່ອີເມວຂອງຂ້ອຍແລ້ວ</string>
+    <string name="login_reset_password_mail_confirmation_notice_2">ແຕະທີ່ລິ້ງເພື່ອຢືນຢັນລະຫັດຜ່ານໃໝ່ຂອງທ່ານ. ເມື່ອທ່ານໄດ້ປະຕິບັດຕາມການເຊື່ອມຕໍ່ທີ່ມີ, ໃຫ້ກົດສ່ຂ້າງລຸ່ມນີ້.</string>
+    <string name="login_reset_password_mail_confirmation_notice">ອີເມລ໌ຢັ້ງຢືນໄດ້ຖືກສົ່ງໄປຫາ %1$s.</string>
+    <string name="login_reset_password_mail_confirmation_title">ກວດເບິ່ງກ່ອງຈົດໝາຍຂອງທ່ານ</string>
+    <string name="login_reset_password_error_not_found">ອີເມວນີ້ບໍ່ໄດ້ເຊື່ອມຕໍ່ກັບບັນຊີໃດໆ</string>
+    <string name="login_reset_password_warning_submit">ສືບຕໍ່</string>
+    <string name="login_reset_password_warning_content">ການປ່ຽນລະຫັດຜ່ານຂອງທ່ານຈະຕັ້ງຄ່າການເຂົ້າລະຫັດແບບຕົ້ນທາງເຖິງປາຍທາງໃນທຸກລະບົບຂອງທ່ານ, ເຮັດໃຫ້ປະຫວັດການສົນທະນາທີ່ເຂົ້າລະຫັດໄວ້ບໍ່ສາມາດອ່ານໄດ້. ຕັ້ງຄ່າການສໍາຮອງກະແຈ ຫຼືສົ່ງອອກກະແຈຫ້ອງຂອງທ່ານຈາກລະບົບອື່ນກ່ອນທີ່ຈະຕັ້ງຄ່າລະຫັດຜ່ານຂອງທ່ານ.</string>
+    <string name="login_reset_password_warning_title">ເຕືອນໄພ!</string>
+    <string name="login_reset_password_password_hint">ລະຫັດຜ່ານໃໝ່</string>
+    <string name="login_reset_password_email_hint">ອີເມວ</string>
+    <string name="login_reset_password_submit">ຕໍ່ໄປ</string>
+    <string name="login_reset_password_notice">ອີເມວຢືນຢັນຈະຖືກສົ່ງໄປຫາກ່ອງຂໍ້ຄວາມຂອງທ່ານເພື່ອຢືນຢັນການຕັ້ງລະຫັດຜ່ານໃໝ່ຂອງທ່ານ.</string>
+    <string name="login_reset_password_on">ຕັ້ງລະຫັດຜ່ານໃໝ່ໃນ %1$s</string>
+    <string name="login_login_with_email_error">ອີເມວນີ້ບໍ່ໄດ້ເຊື່ອມໂຍງກັບບັນຊີໃດໆ.</string>
+    <string name="room_list_catchup_empty_title">ທ່ານຖືກຈັບໄດ້ໝົດແລ້ວ!</string>
+    <string name="login_registration_not_supported">ແອັບພລິເຄຊັນບໍ່ສາມາດສ້າງບັນຊີຢູ່ໃນ homeserver ນີ້.
+\n
+\nທ່ານຕ້ອງການລົງທະບຽນໂດຍໃຊ້ web client ບໍ\?</string>
+    <string name="login_registration_disabled">ຂໍອະໄພ, ເຊີບເວີນີ້ບໍ່ຮັບບັນຊີໃໝ່.</string>
+    <string name="login_mode_not_supported">ແອັບພລິເຄຊັນບໍ່ສາມາດເຂົ້າສູ່ລະບົບ homeserver ນີ້ໄດ້. homeserver ຮອງຮັບປະເພດການເຂົ້າສູ່ລະບົບຕໍ່ໄປນີ້: %1$s.
+\n
+\nທ່ານຕ້ອງການເຂົ້າສູ່ລະບົບໂດຍໃຊ້ web client ບໍ\?</string>
+    <string name="login_sso_error_message">ເກີດຄວາມຜິດພາດຂຶ້ນໃນເວລາໂຫລດໜ້າ: %1$s (%2$d)</string>
+    <string name="login_server_url_form_common_notice">ໃສ່ທີ່ຢູ່ຂອງເຊີບເວີທີ່ທ່ານຕ້ອງການໃຊ້</string>
+    <string name="login_server_url_form_modular_notice">ໃສ່ທີ່ຢູ່ຂອງ Modular Element ຫຼື Server ທີ່ທ່ານຕ້ອງການໃຊ້</string>
+    <string name="login_server_url_form_modular_text">ການເປັນເຈົ້າພາບເປັນທີ່ນິຍົມສໍາລັບອົງການຈັດຕັ້ງ</string>
+    <string name="login_server_url_form_other_hint">ທີ່ຢູ່</string>
+    <string name="login_server_url_form_modular_hint">ທີ່ຢູ່ບໍລິການ Element Matrix</string>
+    <string name="login_clear_homeserver_history">ລ້າງປະຫວັດ</string>
+    <string name="login_signin_sso">ສືບຕໍ່ກັບລະບົບປະຕູດຽວ(SSO)</string>
+    <string name="login_signin">ເຂົ້າສູ່ລະບົບ</string>
+    <string name="login_signup">ລົງທະບຽນ</string>
+    <string name="login_signin_to">ເຂົ້າສູ່ລະບົບ %1$s</string>
+    <string name="login_connect_to_a_custom_server">ເຊື່ອມຕໍ່ກັບເຊີບເວີທີ່ກໍາຫນົດເອງ</string>
+    <string name="login_connect_to_modular">ເຊື່ອມຕໍ່ກັບການບໍລິການ Element Matrix</string>
+    <string name="login_connect_to">ເຊື່ອມຕໍ່ຫາ %1$s</string>
+    <string name="login_continue">ສືບຕໍ່</string>
+    <string name="login_social_sso">ລະບົບປະຕູດຽວ</string>
+    <string name="login_social_signin_with">ເຂົ້າສູ່ລະບົບດ້ວຍ %s</string>
+    <string name="join_space">ເຂົ້າຮ່ວມ ພື້ນທີ່</string>
+    <string name="create_space">ສ້າງພື້ນທີ່</string>
+    <string name="skip_for_now">ຂ້າມໄປດຽວນີ້</string>
+    <string name="share_space_link_message">ເຂົ້າຮ່ວມພື້ນທີ່ຂອງຂ້ອຍ %1$s%2$s</string>
+    <string name="invite_just_to_this_room_desc">ເຂົາເຈົ້າຈະບໍ່ເປັນສ່ວນຫນຶ່ງຂອງ %s</string>
+    <string name="invite_just_to_this_room">ພຽງແຕ່ຫ້ອງນີ້</string>
+    <string name="invite_to_space_with_name_desc">ພວກເຂົາຈະສາມາດສຳຫຼວດ %s</string>
+    <string name="invite_to_space_with_name">ເຊີນເຂົ້າຮ່ວມ %s</string>
+    <string name="invite_by_link">ແບ່ງປັນລິ້ງ</string>
+    <string name="invite_by_username_or_mail">ເຊີນໂດຍຊື່ຜູ້ໃຊ້ ຫຼື ທາງໄປສະນີ</string>
+    <string name="invite_by_email">ເຊີນຜ່ານອີເມລ໌</string>
+    <string name="invite_people_to_your_space_desc">ມີພຽງທ່ານໃນປັດຈຸບັນ. %s ຈະດີກວ່າຖ້າໃຊ້ຮ່ວມກັບຄົນອື່ນ.</string>
+    <string name="invite_to_space">ເຊີນ %s</string>
+    <string name="invite_people_menu">ເຊີນຄົນ</string>
+    <string name="invite_people_to_your_space">ເຊີນຄົນເຂົ້າມາໃນພື້ນທີ່ຂອງທ່ານ</string>
+    <string name="create_space_topic_hint">ລາຍລະອຽດ</string>
+    <string name="create_spaces_loading_message">ກຳລັງສ້າງພື້ນທີ່…</string>
+    <string name="create_spaces_default_public_random_room_name">ສຸ່ມ</string>
+    <string name="create_spaces_default_public_room_name">ທົ່ວໄປ</string>
+    <string name="create_spaces_room_private_header_desc">ໃຫ້ສ້າງຫ້ອງສໍາລັບພວກເຂົາແຕ່ລະຄົນ. ທ່ານສາມາດເພີ່ມເພີ່ມເຕີມໄດ້ໃນພາຍຫຼັງ, ລວມທັງລາຍການທີ່ມີຢູ່ແລ້ວ.</string>
+    <string name="create_spaces_room_private_header">ເຈົ້າກຳລັງເຮັດວຽກຫຍັງແດ່\?</string>
+    <string name="create_spaces_invite_public_header_desc">ໃຫ້ແນ່ໃຈວ່າຄົນທີ່ມີສິດເຂົ້າເຖິງບໍລິສັດ %s. ທ່ານສາມາດເຊີນເພີ່ມເຕີມໄດ້ໃນພາຍຫຼັງ.</string>
+    <string name="create_spaces_invite_public_header">ໃຜເປັນເພື່ອນຮ່ວມທີມຂອງທ່ານ\?</string>
+    <string name="create_spaces_room_public_header_desc">ພວກເຮົາຈະສ້າງຫ້ອງສໍາລັບພວກເຂົາ. ທ່ານສາມາດເພີ່ມເພີ່ມເຕີມໄດ້ໃນພາຍຫຼັງ.</string>
+    <string name="create_spaces_room_public_header">ການສົນທະນາໃດນຶ່ງທີ່ທ່ານຕ້ອງການມີຢູ່ໃນ %s\?</string>
+    <string name="create_space_error_empty_field_space_name">ຕັ້ງຊື່ເພື່ອສືບຕໍ່.</string>
+    <string name="create_spaces_details_private_header">ເພີ່ມລາຍລະອຽດບາງຢ່າງເພື່ອຊ່ວຍໃຫ້ຜູ້ອຶ່ນລະບຸຕົວຕົນໄດ້. ທ່ານສາມາດປ່ຽນສິ່ງເຫຼົ່ານີ້ໄດ້ທຸກເວລາ.</string>
+    <string name="create_spaces_details_public_header">ເພີ່ມລາຍລະອຽດບາງຢ່າງເພື່ອຊ່ວຍໃຫ້ໂດດເດັ່ນ. ທ່ານສາມາດປ່ຽນສິ່ງເຫຼົ່ານີ້ໄດ້ທຸກເວລາ.</string>
+    <string name="activity_create_space_title">ສ້າງພື້ນທີ່</string>
+    <string name="space_type_private_desc">ເຊີນເທົ່ານັ້ນ, ທີ່ດີສຸດສຳລັບຕົວທ່ານເອງ ຫຼື ທີມງານ</string>
+    <string name="space_type_private">ສ່ວນຕົວ</string>
+    <string name="space_type_public_desc">ເປີດໃຫ້ທຸກຄົນ, ທີ່ດີສຸດສຳລັບຊຸມຊົນ</string>
+    <string name="space_type_public">ສາທາລະນະ</string>
+    <string name="create_spaces_private_teammates">ພື້ນທີ່ສ່ວນຕົວສຳລັບ ທ່ານ ແລະ ເພື່ອນຮ່ວມທີມ</string>
+    <string name="create_spaces_me_and_teammates">ຂ້ອຍ ແລະ ເພື່ອນຮ່ວມທີມ</string>
+    <string name="create_spaces_organise_rooms">ພື້ນທີ່ສ່ວນຕົວເພື່ອຈັດລະບຽບຫ້ອງຂອງທ່ານ</string>
+    <string name="create_spaces_just_me">ພຽງແຕ່ຂ້ອຍ</string>
+    <string name="create_spaces_make_sure_access">ໃຫ້ແນ່ໃຈວ່າບຸກຄົນທີ່ມີສິດເຂົ້າເຖິງ %s.</string>
+    <string name="create_spaces_who_are_you_working_with">ທ່ານກໍາລັງເຮັດວຽກກັບໃຜ\?</string>
+    <string name="create_spaces_join_info_help">ເພື່ອເຂົ້າຮ່ວມພື້ນທີ່ທີ່ມີຢູ່, ທ່ານຕ້ອງໄດ້ຮັບເຊີນ.</string>
+    <string name="create_spaces_you_can_change_later">ທ່ານສາມາດປ່ຽນສິ່ງນີ້ໃນພາຍຫຼັງ</string>
+    <string name="create_spaces_choose_type_label">ທ່ານຕ້ອງການສ້າງພື້ນທີ່ປະເພດໃດ\?</string>
+    <string name="your_private_space">ພື້ນທີ່ສ່ວນຕົວຂອງທ່ານ</string>
+    <string name="your_public_space">ພື້ນທີ່ສາທາລະນະຂອງທ່ານ</string>
+    <string name="add_space">ເພີ່ມພື້ນທີ່</string>
+    <string name="private_space">ພື້ນທີ່ສ່ວນຕົວ</string>
+    <string name="public_space">ພື້ນທີ່ສາທາລະນະ</string>
+    <string name="event_status_delete_all_failed_dialog_message">ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການລຶບຂໍ້ຄວາມທີ່ຍັງບໍ່ໄດ້ສົ່ງທັງໝົດຢູ່ໃນຫ້ອງນີ້\?</string>
+    <string name="event_status_delete_all_failed_dialog_title">ລຶບຂໍ້ຄວາມທີ່ຍັງບໍ່ໄດ້ສົ່ງ</string>
+    <string name="event_status_failed_messages_warning">ສົ່ງຂໍ້ຄວາມບໍ່ສຳເລັດ</string>
+    <string name="event_status_cancel_sending_dialog_message">ທ່ານຕ້ອງການຍົກເລີກການສົ່ງຂໍ້ຄວາມບໍ\?</string>
+    <string name="event_status_a11y_delete_all">ລຶບຂໍ້ຄວາມທີ່ບໍ່ສຳເລັດທັງໝົດອອກ</string>
+    <string name="event_status_a11y_failed">ບໍ່ສຳເລັດ</string>
+    <string name="event_status_a11y_sent">ສົ່ງແລ້ວ</string>
+    <string name="event_status_a11y_sending">ກຳລັງສົ່ງ</string>
+    <string name="command_description_upgrade_room">ຍົກລະດັບຫ້ອງເປັນເວີຊັນໃໝ່</string>
+    <string name="command_description_leave_room">ອອກຈາກຫ້ອງດ້ວຍ id (ຫຼື ຫ້ອງປະຈຸບັນຖ້າເປັນ null)</string>
+    <string name="command_description_join_space">ເຂົ້າຮ່ວມພື້ນທີ່ກັບ id ທີ່ກຳນົດໃຫ້</string>
+    <string name="command_description_add_to_space">ເພີ່ມໃສ່ພື້ນທີ່ທີ່ກຳນົດໃຫ້</string>
+    <string name="command_description_create_space">ສ້າງພື້ນທີ່</string>
+    <string name="dev_tools_event_content_hint">ເນື້ອໃນການນັດໝາຍ</string>
+    <string name="dev_tools_success_state_event">ສົ່ງການນັດໝາຍຂອງລັດ!</string>
+    <string name="dev_tools_success_event">ສົ່ງນັດໝາຍ!</string>
+    <string name="dev_tools_error_malformed_event">ເຫດການຜິດປົກກະຕິ</string>
+    <string name="dev_tools_error_no_message_type">ບໍ່ມີປະເພດຂໍ້ຄວາມ</string>
+    <string name="dev_tools_error_no_content">ບໍ່ມີເນື້ອຫາ</string>
+    <string name="dev_tools_form_hint_event_content">ເນື້ອໃນການນັດໝາຍ</string>
+    <string name="dev_tools_form_hint_state_key">ສະຖານະຂອງກະເເຈ</string>
+    <string name="dev_tools_form_hint_type">ປະເພດ</string>
+    <string name="dev_tools_send_custom_state_event">ສົ່ງນັດໝາຍຂອງລັດແບບກຳນົດເອງ</string>
+    <string name="dev_tools_edit_content">ແກ້ໄຂເນື້ອຫາ</string>
+    <string name="dev_tools_state_event">ການນັດໝາຍຂອງລັດ</string>
+    <string name="dev_tools_send_state_event">ສົ່ງນັດມາຍຂອງລັດ</string>
+    <string name="dev_tools_send_custom_event">ສົ່ງນັດໝາຍທີ່ກຳນົດເອງ</string>
+    <string name="dev_tools_explore_room_state">ສຳຫຼວດສະຖານະຫ້ອງ</string>
+    <string name="dev_tools_menu_name">ເຄື່ອງມືພັດທະນາ</string>
+    <string name="a11y_presence_unavailable">ບໍ່ສາມາດໃຊ້ໄດ້</string>
+    <string name="a11y_presence_offline">ອອຟລາຍ</string>
+    <string name="a11y_presence_online">ອອນລາຍ</string>
+    <string name="a11y_public_room">ຫ້ອງສາທາລະນະ</string>
+    <string name="a11y_view_read_receipts">ເບິ່ງໃບຕອບຮັບການອ່ານ</string>
+    <string name="a11y_rule_notify_off">ບໍ່ໄດ້ແຈ້ງເຕືອນ</string>
+    <string name="a11y_rule_notify_silent">ແຈ້ງເຕືອນໂດຍບໍ່ມີສຽງ</string>
+    <string name="a11y_rule_notify_noisy">ແຈ້ງເຕືອນດ້ວຍສຽງ</string>
+    <string name="a11y_error_message_not_sent">ບໍ່ໄດ້ສົ່ງຂໍ້ຄວາມເນື່ອງຈາກຄວາມຜິດພາດ</string>
+    <string name="a11y_unchecked">ບໍ່ໄດ້ເລືອກ</string>
+    <string name="a11y_checked">ກວດແລ້ວ</string>
+    <string name="a11y_close_emoji_picker">ເປິດຕົວເລືອກ Emoji</string>
+    <string name="a11y_open_emoji_picker">ເປີດຕົວເລືອກ Emoji</string>
+    <string name="a11y_trust_level_trusted">ລະດັບຄວາມໄວ້ວາງໃຈໄດ້</string>
+    <string name="a11y_trust_level_warning">ລະດັບຄວາມເຊື່ອໝັ້ນຂອງຄຳເຕືອນ</string>
+    <string name="a11y_trust_level_default">ລະດັບຄວາມເຊື່ອຖືໃນເບື້ອງເລີ່ມຕົ້ນ</string>
+    <string name="a11y_selected">ເລືອກແລ້ວ</string>
+    <string name="a11y_video">ວິດີໂອ</string>
+    <string name="a11y_unsent_draft">ມີສະບັບຮ່າງທີ່ຍັງບໍ່ໄດ້ສົ່ງ</string>
+    <string name="a11y_error_some_message_not_sent">ບາງຂໍ້ຄວາມຍັງບໍ່ໄດ້ສົ່ງໄປ</string>
+    <string name="a11y_delete_avatar">ລຶບຮູບແທນຕົວ</string>
+    <string name="a11y_change_avatar">ປ່ຽນຮູບແທນຕົວ</string>
+    <string name="a11y_image">ຮູບພາບ</string>
+    <string name="a11y_import_key_from_file">ນໍາເຂົ້າລະຫັດຈາກໄຟລ໌</string>
+    <string name="a11y_open_widget">ເປີດ widget</string>
+    <string name="a11y_screenshot">ພາບໜ້າຈໍ</string>
+    <string name="authentication_error">ການຢືນຢັນບໍ່ສຳເລັດ</string>
+    <string name="re_authentication_default_confirm_text">${app_name} ຮ້ອງຂໍໃຫ້ທ່ານໃສ່ຂໍ້ມູນປະຈໍາຕົວຂອງທ່ານເພື່ອດໍາເນີນການນີ້.</string>
+    <string name="re_authentication_activity_title">ຕ້ອງການພິສູດການຢືນຢັນຄືນໃໝ່</string>
+    <string name="call_slide_to_end_conference">ເລື່ອນເພື່ອວາງສາຍ</string>
+    <string name="call_transfer_unknown_person">ບຸກຄົນທີ່ບໍ່ຮູ້ຈັກ</string>
+    <string name="call_transfer_transfer_to_title">ໂອນໄປ %1$s</string>
+    <string name="call_transfer_consulting_with">ໃຫ້ຄໍາປຶກສາກັບ %1$s</string>
+    <string name="call_transfer_users_tab_title">ຜູ້ໃຊ້</string>
+    <string name="call_transfer_failure">ເກີດຄວາມຜິດພາດໃນລະຫວ່າງການໂອນສາຍ</string>
+    <string name="call_transfer_title">ໂອນ</string>
+    <string name="call_transfer_connect_action">ເຊື່ອມຕໍ່</string>
+    <string name="call_transfer_consult_first">ປຶກສາກ່ອນ</string>
+    <string name="call_tap_to_return">%1$s ແຕະເພື່ອກັບຄືນ</string>
+    <string name="call_one_active">ການໂທເຂົ້າ (%1$s) ·</string>
+    <plurals name="call_active_status">
+        <item quantity="other">%1$d ສາຍໂທເຂົ້າ.</item>
+    </plurals>
+    <string name="call_only_active">ການໂທເຂົ້າ (%1$s)</string>
+    <string name="call_dial_pad_lookup_error">ກີດຄວາມຜິດພາດໃນການຊອກຫາເບີໂທລະສັບ</string>
+    <string name="call_dial_pad_title">ປຸ່ມກົດ</string>
+    <string name="call_tile_no_answer">ບໍ່ຮັບສາຍ</string>
+    <string name="call_tile_video_missed">ສາຍວິດີໂອທີ່ບໍ່ໄດ້ຮັບ</string>
+    <string name="call_tile_voice_missed">ສາຍບໍ່ໄດ້ຮັບ</string>
+    <string name="call_tile_video_declined">ປະຕິເສດການໂທວິດີໂອ</string>
+    <string name="call_tile_voice_declined">ການໂທດ້ວຍສຽງຖືກປະຕິເສດ</string>
+    <string name="login_social_signup_with">ສະໝັກດ້ວຍ %s</string>
+    <string name="login_social_continue_with">ສືບຕໍ່ດ້ວຍ %s</string>
+    <string name="login_social_continue">ຫຼື</string>
+    <string name="login_server_other_text">ການຕັ້ງຄ່າແບບກຳນົດເອງ ແລະຂັ້ນສູງ</string>
+    <string name="login_server_other_title">ອື່ນໆ</string>
+    <string name="login_server_modular_learn_more">ສຶກສາເພີ່ມເຕີມ</string>
+    <string name="login_server_modular_text">ການເປັນເຈົ້າພາບເປັນທີ່ນິຍົມສໍາລັບອົງການຈັດຕັ້ງ</string>
+    <string name="login_server_matrix_org_text">ເຂົ້າຮ່ວມຫຼາຍລ້ານຄົນໄດ້ຟຣີໃນເຊີບເວີສາທາລະນະທີ່ໃຫຍ່ທີ່ສຸດ</string>
+    <string name="login_server_text">ເຊັ່ນກຽວກັບອີເມລ໌, ບັນຊີມີອັນດຽວ, ເຖິງແມ່ນວ່າທ່ານສາມາດລົມກັບໃຜກໍຕາມ</string>
+    <string name="login_server_title">ເລືອກເຊີບເວີ</string>
+    <string name="login_splash_already_have_account">ຂ້ອຍມີບັນຊີຢູ່ແລ້ວ</string>
+    <string name="login_splash_create_account">ສ້າງບັນຊີ</string>
+    <string name="login_splash_submit">ເລີ່ມຕົ້ນ</string>
+    <string name="login_splash_text3">ຂະຫຍາຍ ແລະ ປັບແຕ່ງປະສົບການຂອງທ່ານ</string>
+    <string name="login_splash_text2">ຮັກສາການສົນທະນາສ່ວນຕົວດ້ວຍການເຂົ້າລະຫັດ</string>
+    <string name="login_splash_text1">ສົນທະນາກັບຄົນໂດຍກົງຫຼືເປັນກຸ່ມ</string>
+    <string name="login_splash_title">ເປັນການສົນທະນາຂອງທ່ານ. ເປັນເຈົ້າຂອງ ຂອງມັນ.</string>
+    <string name="ftue_personalize_skip_this_step">ຂ້າມຂັ້ນຕອນນີ້</string>
+    <string name="ftue_personalize_submit">ບັນທຶກ ແລະ ສືບຕໍ່</string>
+    <string name="ftue_personalize_complete_subtitle">ບັນທຶກຄວາມມັກຂອງທ່ານໄວ້.</string>
+    <string name="ftue_personalize_complete_title">ທ່ານພ້ອມແລ້ວ!</string>
+    <string name="ftue_personalize_lets_go">ໄປກັນເລີຍ</string>
+    <string name="ftue_profile_picture_subtitle">ທ່ານສາມາດປ່ຽນອັນນີ້ໄດ້ທຸກເວລາ.</string>
+    <string name="ftue_profile_picture_title">ເພີ່ມຮູບໂປຣໄຟລ໌</string>
+    <string name="ftue_display_name_entry_footer">ທ່ານສາມາດປ່ຽນອັນນີ້ໃນພາຍຫຼັງ</string>
+    <string name="ftue_display_name_entry_title">ຊື່ສະແດງ</string>
+    <string name="bootstrap_crosssigning_save_cloud">ສຳເນົາໃສ່ບ່ອນຈັດເກັບຂໍ້ມູນຄລາວສ່ວນຕົວຂອງທ່ານ</string>
+    <string name="bootstrap_crosssigning_save_usb">ບັນທຶກມັນໄວ້ໃນກະແຈ USB ຫຼື ໄດຣຟ໌ສຳຮອງ</string>
+    <string name="bootstrap_crosssigning_print_it">ພິມອອກ ແລະ ເກັບຮັກສາໄວ້ບ່ອນທີ່ປອດໄພ</string>
+    <string name="bootstrap_cross_signing_success">%2$s &amp; %1$s ຂອງທ່ານໄດ້ຕັ້ງຄ່າແລ້ວ.
+\n
+\nຮັກສາຄວາມປອດໄພ! ທ່ານຈະຕ້ອງປົດລັອກຂໍ້ຄວາມທີ່ເຂົ້າລະຫັດ ແລະ ຂໍ້ມູນທີ່ປອດໄພຖ້າຫາກວ່າທ່ານສູນເສຍການເຂົ້າຮ່ວມທັງຫມົດຂອງທ່ານ.</string>
+    <string name="bootstrap_crosssigning_progress_key_backup">ການຕັ້ງຄ່າສໍາຮອງຂໍ້ມູນກະແຈ</string>
+    <string name="bootstrap_crosssigning_progress_save_ssk">ການຊິ້ງຂໍ້ມູນລະຫັດດ້ວຍຕົນເອງ</string>
+    <string name="bootstrap_crosssigning_progress_save_usk">ກຳລັງຊິ້ງລະຫັດຜູ້ໃຊ້</string>
+    <string name="bootstrap_crosssigning_progress_save_msk">ກຳລັງຊິ້ງລະຫັດຫຼັກ</string>
+    <string name="bootstrap_crosssigning_progress_default_key">ກໍານົດລະຫັດເລີ່ມຕົ້ນ SSSS</string>
+    <string name="bootstrap_crosssigning_progress_pbkdf2">ກຳລັງສ້າງກະແຈທີ່ປອດໄພຈາກປະໂຫຍກລະຫັດຄວາມປອດໄພ</string>
+    <string name="bootstrap_crosssigning_progress_initializing">ການເຜີຍແຜ່ລະຫັດທີ່ສ້າງຂຶ້ນ</string>
+    <string name="finish">ຈົບ</string>
+    <string name="keep_it_safe">ຮັກສາຄວາມປອດໄພ</string>
+    <string name="bootstrap_finish_title">ທ່ານສຳເລັດແລ້ວ!</string>
+    <string name="bootstrap_loading_title">ຕັ້ງຄ່າການກູ້ຂໍ້ມູນ.</string>
+    <string name="bootstrap_loading_text">ອັນນີ້ອາດຈະໃຊ້ເວລາຫຼາຍວິນາທີ, ກະລຸນາລໍຖ້າ.</string>
+    <string name="bootstrap_info_text_2">ກະລຸນາໃສ່ປະໂຫຍກຄວາມປອດໄພທີ່ທ່ານຮູ້, ໃຊ້ເພື່ອຮັບປະກັນຄວາມລັບຢູ່ໃນເຊີບເວີຂອງທ່ານ.</string>
+    <string name="bootstrap_dont_reuse_pwd">ຢ່າໃຊ້ລະຫັດຜ່ານບັນຊີຂອງທ່ານ.</string>
+    <string name="enter_account_password">ໃສ່ %s ຂອງທ່ານເພື່ອສືບຕໍ່.</string>
+    <string name="message_key">ກະແຈຂໍ້ຄວາມ</string>
+    <string name="recovery_passphrase">ປະໂຫຍກລະຫັດຜ່ານການກູ້ຄືນ</string>
+    <string name="verification_cancelled">ຍົກເລີກການຢັ້ງຢືນແລ້ວ</string>
+    <string name="verify_cancelled_notice">ການຢັ້ງຢືນໄດ້ຖືກຍົກເລີກ. ທ່ານສາມາດເລີ່ມຕົ້ນການຢັ້ງຢືນອີກຄັ້ງ.</string>
+    <string name="verify_not_me_self_verification">ຫນຶ່ງໃນຕໍ່ໄປນີ້ອາດຈະຖືກໂຈມຕີ:
+\n
+\n- ລະຫັດຜ່ານຂອງທ່ານ
+\n- homeserverຂອງທ່ານ
+\n- ອຸປະກອນນີ້, ຫຼື ອຸປະກອນອື່ນໆ
+\n- ການເຊື່ອມຕໍ່ອິນເຕີເນັດອຸປະກອນການນໍາໃຊ້
+\n
+\nພວກເຮົາແນະນຳໃຫ້ທ່ານປ່ຽນລະຫັດຜ່ານ ແລະ ກະແຈການກູ້ຂໍ້ມູນຂອງທ່ານໃນການຕັ້ງຄ່າທັນທີ.</string>
+    <string name="verify_cancel_other">ທ່ານຈະບໍ່ຖືກຢືນຢັນ %1$s (%2$s) ຖ້າຫາກທ່ານຍົກເລີກດຽວນີ້. ເລີ່ມຕົ້ນອີກຄັ້ງໃນໂປຣໄຟລ໌ຜູ້ໃຊ້ຂອງພວກເຂົາ.</string>
+    <string name="verify_cancel_self_verification_from_trusted">ຖ້າຫາກທ່ານຍົກເລີກ, ທ່ານຈະບໍ່ສາມາດອ່ານຂໍ້ຄວາມທີ່ຖືກເຂົ້າລະຫັດຢູ່ໃນອຸປະກອນໃຫມ່ຂອງທ່ານໄດ້, ແລະ ຜູ້ໃຊ້ອື່ນໆຈະບໍ່ເຊື່ອມັນ</string>
+    <string name="verify_cancel_self_verification_from_untrusted">ຖ້າຫາກທ່ານຍົກເລີກ, ທ່ານຈະບໍ່ສາມາດອ່ານຂໍ້ຄວາມທີ່ເຂົ້າລະຫັດໄວ້ໃນອຸປະກອນນີ້ໄດ້, ແລະ ຜູ້ໃຊ້ອື່ນໆຈະບໍ່ເຊື່ອຖື</string>
+    <string name="verify_new_session_compromized">ບັນຊີຂອງທ່ານອາດຈະຖືກໂຈມຕີ</string>
+    <string name="verify_new_session_was_not_me">ນີ້ບໍ່ແມ່ນຂ້ອຍ</string>
+    <string name="verify_new_session_notice">ໃຊ້ລະບົບນີ້ເພື່ອຢືນຢັນໃໝ່ຂອທ່ານ, ໃຫ້ເຂົ້າເຖິງຂໍ້ຄວາມທີ່ເຂົ້າລະຫັດໄວ້.</string>
+    <string name="new_session">ເຂົ້າສູ່ລະບົບໃໝ່. ນີ້ແມ່ນທ່ານບໍ\?</string>
+    <string name="refresh">ໂຫຼດຫນ້າຈໍຄືນ</string>
+    <string name="e2e_use_keybackup">ປົດລັອກປະຫວັດຂໍ້ຄວາມທີ່ເຂົ້າລະຫັດໄວ້</string>
+    <string name="settings_export_trail">ກວດສອບການສົ່ງອອກ</string>
+    <string name="settings_key_requests">ການຮ້ອງຂໍທີ່ສຳຄັນ</string>
+    <string name="login_default_session_public_name">${app_name} Android</string>
+    <string name="keys_backup_restore_success_title_already_up_to_date">ລະຫັດແມ່ນທັນສະໄຫມແລ້ວ!</string>
+    <string name="event_redacted_by_admin_reason_with_reason">ເຫດການຖືກກວດສອບໂດຍຜູ້ເບິ່ງແຍງຫ້ອງ, ເຫດຜົນ: %1$s</string>
+    <string name="event_redacted_by_user_reason_with_reason">ເຫດການທີ່ລຶບໂດຍຜູ້ໃຊ້, ເຫດຜົນ: %1$s</string>
+    <string name="delete_event_dialog_reason_hint">ເຫດຜົນສໍາລັບການແກ້ໄຂ</string>
+    <string name="delete_event_dialog_reason_checkbox">ລວມທັງເຫດຜົນ</string>
+    <string name="delete_event_dialog_content">ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການລຶບ (ລຶບ) ເຫດການນີ້ອອກ\? ກະລຸນາຮັບຊາບວ່າຖ້າຫາກທ່ານລຶບຊື່ຫ້ອງ ຫຼື ການປ່ຽນຫົວຂໍ້, ມັນສາມາດຍົກເລີກການປ່ຽນແປງໄດ້.</string>
+    <string name="delete_event_dialog_title">ຢືນຢັນການລຶບອອກ</string>
+    <string name="send_images_and_video_with_original_size">ສົ່ງສື່ຕາມຂະຫນາດຕົ້ນສະບັບ</string>
+    <plurals name="send_videos_with_original_size">
+        <item quantity="other">ສົ່ງວິດີໂອຕາມຂະຫນາດຕົ້ນສະບັບ</item>
+    </plurals>
+    <plurals name="send_images_with_original_size">
+        <item quantity="other">ສົ່ງຮູບພາບຕາມຂະຫນາດຕົ້ນສະບັບ</item>
+    </plurals>
+    <string name="share_confirm_room">ທ່ານຕ້ອງການສົ່ງໄຟລ໌ແນບນີ້ໄປຫາ %1$s ບໍ\?</string>
+    <string name="message_action_item_redact">ລຶບອອກ…</string>
+    <string name="enter_secret_storage_invalid">ບໍ່ສາມາດຊອກຫາຄວາມລັບຢູ່ໃນບ່ອນຈັດເກັບ</string>
+    <string name="verification_use_passphrase">ຖ້າທ່ານບໍ່ສາມາດເຂົ້າເຖິງລະບົບທີ່ມີຢູ່ແລ້ວ</string>
+    <string name="verification_cannot_access_other_session">ໃຊ້ລະຫັດຜ່ານການກູ້ຂໍ້ມູນ ຫຼື ໃຊ້ກະເເຈ</string>
+    <string name="delete_account_data_warning">ລຶບຂໍ້ມູນບັນຊີປະເພດ %1$s ບໍ\?
+\n
+\nໃຊ້ຢ່າງລະມັດລະວັງ, ມັນອາດຈະນໍາໄປສູ່ພຶດຕິກໍາທີ່ບໍ່ຄາດຄິດ.</string>
+    <string name="settings_dev_tools">ເຄື່ອງມືພັດທະນາ</string>
+    <string name="no_connectivity_to_the_server_indicator_airplane">ເປີດໂໝດຢູ່ໃນຍົນແລ້ວ</string>
+    <string name="no_connectivity_to_the_server_indicator">ຂາດການເຊື່ອມຕໍ່ກັບເຊີບເວີ</string>
+    <string name="qr_code_scanned_by_other_no">ບໍ່</string>
+    <string name="qr_code_scanned_by_other_yes">ແມ່ນແລ້ວ</string>
+    <string name="qr_code_scanned_by_other_notice">ເກືອບຈະແລ້ວ! %s ສະແດງເຄື່ອງໝາຍຖືກບໍ\?</string>
+    <string name="a11y_qr_code_for_verification">ລະຫັດ QR</string>
+    <string name="reset_cross_signing">ຕັ້ງຄ່າກະເເຈຄືນໃໝ່</string>
+    <string name="initialize_cross_signing">ເລີ່ມຕົ້ນ CrossSigning</string>
+    <string name="verification_profile_device_untrust_info">ຂໍ້ຄວາມທີ່ສົ່ງໄປຫາ ແລະ ກັບຈະຕິດເຄື່ອງໝາຍໄວ້ຈົນກວາຜູ້ໃຊ້ນີ້ຈະໄວ້ວາງໃຈ. ອີກທາງເລືອກໜຶ່ງ, ທ່ານສາມາດກວດສອບດ້ວຍຕົນເອງ.</string>
+    <string name="verification_profile_device_new_signing">%1$s (%2$s) ເຂົ້າສູ່ລະບົບໂດຍໃຊ້ລະບົບໃໝ່:</string>
+    <string name="verification_profile_device_verified_because">ລະບົບນີ້ເຊື່ອຖືໄດ້ສໍາລັບການສົ່ງຂໍ້ຄວາມທີ່ປອດໄພ ເພາະວ່າ %1$s (%2$s) ໄດ້ຢັ້ງຢືນແລ້ວ:</string>
+    <string name="not_trusted">ເຊື່ອຖືບໍ່ໄດ້</string>
+    <string name="trusted">ເຊື່ອຖືໄດ້</string>
+    <string name="room_member_profile_sessions_section_title">ລະບົບ</string>
+    <string name="room_member_profile_failed_to_get_devices">ການຮັບລະບົບບໍ່ສຳເລັດ</string>
+    <string name="verification_profile_warning">ຄຳເຕືອນ</string>
+    <string name="verification_profile_verified">ຢັ້ງຢືນແລ້ວ</string>
+    <string name="verification_profile_verify">ຢືນຢັນ</string>
+    <string name="verification_open_other_to_verify">ໃຊ້ລະບົບທີ່ມີຢູ່ແລ້ວເພື່ອກວດສອບ, ໃຫ້ເຂົ້າເຖິງຂໍ້ຄວາມທີ່ຖືກເຂົ້າລະຫັດ.</string>
+    <string name="crosssigning_verify_this_session">ຢືນຢັນການເຂົ້າສູ່ລະບົບນີ້</string>
+    <plurals name="settings_active_sessions_count">
+        <item quantity="other">%dລະບົບທີ່ໃຊ້ງານຢູ່</item>
+    </plurals>
+    <string name="settings_active_sessions_unverified_device_desc">ຢືນຢັນລະບົບນີ້ເພື່ອກຳນົດເຄື່ອງໝາຍທີ່ເຊື່ອຖືໄດ້ ແລະໃຫ້ສິດເຂົ້າເຖິງຂໍ້ຄວາມທີ່ເຂົ້າລະຫັດໄວ້. ຖ້າທ່ານບໍ່ໄດ້ເຂົ້າສູ່ລະບົບນີ້ ບັນຊີຂອງທ່ານອາດຈະຖືກໂຈມຕີ:</string>
+    <string name="settings_active_sessions_verified_device_desc">ລະບົບນີ້ຖືກເຊື່ອຖືໄດ້ສຳລັບການສົ່ງຂໍ້ຄວາມທີ່ປອດໄພ ເພາະວ່າທ່ານໄດ້ຢັ້ງຢືນແລ້ວ:</string>
+    <string name="settings_failed_to_get_crypto_device_info">ບໍ່ມີຂໍ້ມູນການເຂົ້າລະຫັດລັບ</string>
+    <string name="settings_server_room_version_unstable">ບໍ່ໝັ້ນຄົງ</string>
+    <string name="settings_server_room_version_stable">ໝັ້ນຄົງ</string>
+    <string name="settings_server_default_room_version">ເວີຊັນເລີ່ມຕົ້ນ</string>
+    <string name="settings_server_room_versions">ເວີຊັ້ນຫ້ອງ 👓</string>
+    <string name="settings_server_upload_size_unknown">ບໍ່ຮູ້ຂອບເຂດຈໍາກັດ.</string>
+    <string name="settings_server_upload_size_content">homeserver ຂອງທ່ານຍອມຮັບໄຟລ໌ແນບ (ໄຟລ໌, ມີເດຍ, ແລະ ອື່ນໆ) ທີ່ມີຂະຫນາດເຖິງ %s.</string>
+    <string name="settings_server_upload_size_title">ຂີດຈຳກັດການອັບໂຫລດໄຟລ໌ເຊີບເວີ</string>
+    <string name="settings_server_version">ເວີຊັ້ນເຊີບເວີ</string>
+    <string name="settings_server_name">ຊື່ເຊີບເວີ</string>
+    <string name="settings_active_sessions_signout_device">ອອກຈາກລະບົບນີ້</string>
+    <string name="settings_active_sessions_manage">ຈັດການ ລະບົບ</string>
+    <string name="settings_active_sessions_show_all">ສະແດງລະບົບທັງໝົດ</string>
+    <string name="settings_active_sessions_list">ລະບົບທີ່ໃຊ້ງານ</string>
+    <string name="settings_hs_admin_e2e_disabled">ຜູ້ເບິ່ງແຍງເຊີບເວີຂອງທ່ານໄດ້ປິດການນຳໃຊ້ການເຂົ້າລະຫັດແແຕ່ຕົ້ນທາງຮອດປາຍທາງໂດຍຄ່າເລີ່ມຕົ້ນໃນຫ້ອງສ່ວນຕົວ ແລະ ຂໍ້ຄວາມໂດຍກົງ.</string>
+    <string name="encryption_information_dg_xsigning_disabled">Cross-Signing ບໍ່ໄດ້ເປີດໃຊ້ງານ</string>
+    <string name="encryption_information_dg_xsigning_not_trusted">Cross-Signing ແມ່ນເປີດໃຊ້ງານ.
+\nກະເເຈຄີບໍ່ໜ້າເຊື່ອຖືໄດ້</string>
+    <string name="encryption_information_dg_xsigning_trusted">Cross-Signing ແມ່ນເປີດໃຊ້ງານ
+\nກະເເຈແມ່ນໜ້າເຊື່ອຖືໄດ້.
+\nກະແຈສ່ວນຕົວບໍ່ຮູ້ຈັກ</string>
+    <string name="encryption_information_dg_xsigning_complete">Cross-Signing ແມ່ນເປີດໃຊ້ງານ
+\nກະແຈສ່ວນຕົວຢູ່ໃນອຸປະກອນ.</string>
+    <string name="encryption_information_cross_signing_state">Cross-Signing</string>
+    <string name="verification_conclusion_ok_self_notice">ຕອນນີ້ລະບົບໃໝ່ຂອງທ່ານໄດ້ຮັບການຢັ້ງຢືນແລ້ວ.ມີການເຂົ້າເຖິງຂໍ້ຄວາມທີ່ເຂົ້າລະຫັດຂອງທ່ານ, ແລະ ຜູ້ໃຊ້ອື່ນໆຈະເຫັນວ່າເປັນທີ່ເຊື່ອຖືໄດ້.</string>
+    <string name="verification_conclusion_ok_notice">ຂໍ້ຄວາມຜູ້ໃຊ້ນີ້ແມ່ນເຂົ້າລະຫັດແຕ່ຕົ້ນທາງເຖິງປາຍທາງ ແລະ ບໍ່ສາມາດອ່ານໄດ້ໂດຍພາກສ່ວນທີສາມ.</string>
+    <string name="room_settings_enable_encryption_dialog_content">ເມື່ອເປີດໃຊ້ແລ້ວ, ການເຂົ້າລະຫັດລັບຂອງຫ້ອງບໍ່ສາມາດປິດໃຊ້ງານໄດ້. ຂໍ້ຄວາມທີ່ສົ່ງຢູ່ໃນຫ້ອງທີ່ເຂົ້າລະຫັດບໍ່ສາມາດເຫັນໄດ້ ເຊີບເວີບໍ່ສາມາດເບິ່ງເບິ່ງຂໍ້ຄວາມທີ່ສົ່ງໃນຫ້ອງທີ່ເຂົ້າລະຫັດ, ມີແຕ່ຜູ້ເຂົ້າຮ່ວມຂອງຫ້ອງເທົ່ານັ້ນ. ການເປີດໃຊ້ການເຂົ້າລະຫັດອາດຈະປ້ອງກັນບໍ່ໃຫ້ bots ແລະ bridgesຈໍານວນຫຼາຍເຮັດວຽກຢ່າງຖືກຕ້ອງ.</string>
+    <string name="verification_code_notice">ປຽບທຽບລະຫັດທີ່ສະແດງຢູ່ໃນໜ້າຈໍຂອງຜູ້ໃຊ້ອື່ນ.</string>
+    <string name="verification_emoji_notice">ປຽບທຽບ emoji ທີ່ເປັນເອກະລັກ, ໃຫ້ແນ່ໃຈວ່າພວກມັນປາກົດຢູ່ໃນລໍາດັບດຽວກັນ.</string>
+    <string name="verification_request_start_notice">ເພື່ອຄວາມປອດໄພ, ດຳເນິນການແບບນີ້ດ້ວຍຕົນເອງ ຫຼື ໃຊ້ວິທີອື່ນເພື່ອຕິດຕໍ່ສື່ສານ.</string>
+    <string name="verification_request_notice">ເພື່ອຄວາມປອດໄພ, ກະລຸນາຢັ້ງຢືນ %s ໂດຍການກວດສອບລະຫັດຄັ້ງດຽວ.</string>
+    <string name="room_settings_enable_encryption_dialog_submit">ເປີດໃຊ້ງານການເຂົ້າລະຫັດ</string>
+    <string name="room_settings_enable_encryption_dialog_title">ເປີດໃຊ້ການເຂົ້າລະຫັດບໍ\?</string>
+    <string name="room_settings_enable_encryption_no_permission">ທ່ານບໍ່ໄດ້ຮັບອະນຸຍາດໃຫ້ເປີດໃຊ້ການເຂົ້າລະຫັດໃນຫ້ອງນີ້.</string>
+    <string name="room_settings_enable_encryption">ເປີດການເຂົ້າລະຫັດແຕ່ຕົ້ນທາງເຖິງປາຍທາງ…</string>
+    <string name="settings_category_composer">ບັນນາທິການຂໍ້ຄວາມ</string>
+    <string name="settings_category_timeline">ທາມລາຍ</string>
+    <string name="command_description_rainbow_emote">ສົ່ງ emote ທີ່ກຳນົດເປັນສີຮຸ້ງ</string>
+    <string name="command_description_rainbow">ສົ່ງຂໍ້ຄວາມທີ່ກຳນົດເປັນສີຮຸ້ງ</string>
+    <string name="verify_cannot_cross_sign">ລະບົບນີ້ບໍ່ສາມາດແບ່ງປັນການຢືນຢັນນີ້ກັບລະບົບອື່ນຂອງທ່ານໄດ້.
+\nການຢັ້ງຢືນຈະຖືກບັນທຶກໄວ້ໃນເຄື່ອງ ແລະ ແບ່ງປັນໃນເວີຊັນຂອງແອັບໃນອະນາຄົດ.</string>
+    <string name="unignore">ບໍ່ສົນໃຈ</string>
+    <string name="rendering_event_error_exception">${app_name} ປະສົບບັນຫາໃນເວລາສະແດງເນື້ອຫາຂອງເຫດການດ້ວຍ id \'%1$s\'</string>
+    <string name="rendering_event_error_type_of_event_not_handled">${app_name} ບໍ່ໄດ້ຈັດການເຫດການຂອງປະເພດ \'%1$s\'</string>
+    <string name="room_member_jump_to_read_receipt">ໄປເພື່ອອ່ານ</string>
+    <string name="room_member_open_or_create_dm">ຂໍ້ຄວາມໂດຍກົງ</string>
+    <string name="room_member_power_level_custom_in">ກຳນົດເອງ (%1$d) ໃນ %2$s</string>
+    <string name="room_member_power_level_default_in">ຄ່າເລີ່ມຕົ້ນໃນ %1$s</string>
+    <string name="room_member_power_level_moderator_in">ຜູ້ຄວບຄຸມໃນ %1$s</string>
+    <string name="room_member_power_level_admin_in">ຜູ້ເບິ່ງແຍງລະບົບໃນ %1$s</string>
+    <string name="room_member_power_level_users">ຜູ້ໃຊ້</string>
+    <string name="room_member_power_level_invites">ເຊີນ</string>
+    <string name="room_member_power_level_custom">ກຳນົດເອງ</string>
+    <string name="room_member_power_level_moderators">ຜູ້ຄວບຄຸມ</string>
+    <string name="room_member_power_level_admins">ຜູ້ເບິ່ງແຍງລະບົບ</string>
+    <string name="room_member_override_nick_color">ລົບລ້າງສີ nick</string>
+    <string name="room_profile_leaving_room">ກຳລັງອອກຈາກຫ້ອງ…</string>
+    <string name="direct_room_profile_section_more_leave">ອອກໄປ</string>
+    <string name="room_profile_section_more_leave">ອອກຈາກຫ້ອງ</string>
+    <string name="room_profile_section_more_uploads">ອັບໂຫຼດ</string>
+    <string name="ftue_display_name_subtitle">ສິ່ງນີ້ຈະຖືກສະແດງເມື່ອທ່ານສົ່ງຂໍ້ຄວາມ.</string>
+    <string name="ftue_display_name_title">ເລືອກຊື່ທີ່ຈະສະແດງ</string>
+    <string name="ftue_account_created_subtitle">ບັນຊີຂອງທ່ານ%sໄດ້ຖືກສ້າງຂື້ນແລ້ວ.</string>
+    <string name="ftue_account_created_congratulations_title">ຊົມເຊີຍ!</string>
+    <string name="ftue_account_created_take_me_home">ພາຂ້ອຍກັບບ້ານ</string>
+    <string name="ftue_account_created_personalize">ປັບແຕ່ງໂປຣໄຟລ໌</string>
+    <string name="ftue_auth_use_case_connect_to_server">ເຊື່ອມຕໍ່ກັບເຊີບເວີ</string>
+    <string name="ftue_auth_use_case_join_existing_server">ຊອກການເຂົ້າຮ່ວມເຊີບເວີທີ່ມີຢູ່ແລ້ວບໍ\?</string>
+    <string name="ftue_auth_use_case_skip_partial">ຂ້າມຄໍາຖາມນີ້</string>
+    <string name="ftue_auth_use_case_skip">ບໍ່ແນ່ໃຈເທື່ອ\?ທາ່ນສາມາດ %s</string>
+    <string name="ftue_auth_use_case_option_three">ຊຸມຊົນ</string>
+    <string name="ftue_auth_use_case_option_two">ທີມງານ</string>
+    <string name="ftue_auth_use_case_option_one">ຫມູ່ເພື່ອນແລະຄອບຄົວ</string>
+    <string name="ftue_auth_use_case_subtitle">ພວກເຮົາຈະຊ່ວຍໃຫ້ທ່ານເຊື່ອມຕໍ່ໄດ້.</string>
+    <string name="ftue_auth_use_case_title">ທ່ານຈະສົນທະນາກັບໃຜຫຼາຍທີ່ສຸດ\?</string>
+    <string name="ftue_auth_carousel_workplace_body">${app_name} ແມ່ນດີຫຼາຍສຳລັບບ່ອນເຮັດວຽກ. ໄດ້ຮັບຄວາມໄວ້ວາງໃຈໂດຍອົງການຈັດຕັ້ງທີ່ປອດໄພທີ່ສຸດຂອງໂລກ.</string>
+    <string name="ftue_auth_carousel_encrypted_body">ເຂົ້າລະຫັດແຕ່ຕົ້ນທາງຮອດປາຍທາງ ແລະ ບໍ່ຕ້ອງການເບີໂທລະສັບ. ບໍ່ມີການໂຄສະນາ ຫຼືການຂຸດຄົ້ນຂໍ້ມູນ.</string>
+    <string name="ftue_auth_carousel_control_body">ເລືອກບ່ອນທີ່ຈະເກັບການສົນທະນາຂອງທ່ານ, ໃຫ້ທ່ານຄວບຄຸມແລະເປັນເອກະລາດ. ເຊື່ອມຕໍ່ຜ່ານ Matrix.</string>
+    <string name="ftue_auth_carousel_secure_body">ການສື່ສານທີ່ປອດໄພ ແລະ ເປັນເອກະລາດທີ່ເຮັດໃຫ້ທ່ານມີຄວາມເປັນສ່ວນຕົວໃນລະດັບດຽວກັນກັບການສົນທະນາແບບເຫັນໜ້າຢູ່ໃນເຮືອນຂອງທ່ານເອງ.</string>
+    <string name="ftue_auth_carousel_workplace_title">ຂໍ້ຄວາມສໍາລັບທີມງານຂອງທ່ານ.</string>
+    <string name="ftue_auth_carousel_encrypted_title">ການສົ່ງຂໍ້ຄວາມທີ່ປອດໄພ.</string>
+    <string name="ftue_auth_carousel_control_title">ທ່ານຄວບຄຸມໄດ້.</string>
+    <string name="ftue_auth_carousel_secure_title">ເປັນເຈົ້າຂອງບົດສົນທະນາຂອງທ່ານ.</string>
+    <string name="timeline_unread_messages">ຂໍ້ຄວາມທີ່ຍັງບໍ່ໄດ້ອ່ານ</string>
+    <string name="direct_room_join_rules_invite_by_you">ທ່ານເປັນຜູ້ເຊີນນີ້ເທົ່ານັ້ນ.</string>
+    <string name="direct_room_join_rules_invite">%1$s ເຊີນນີ້ເທົ່ານັ້ນ.</string>
+    <string name="room_join_rules_invite_by_you">ທ່ານໄດ້ເຊີນຫ້ອງເທົ່ານັ້ນ.</string>
+    <string name="room_join_rules_invite">%1$s ກຳນົດຫ້ອງຖືກເຊີນເທົ່ານັ້ນ.</string>
+    <string name="room_join_rules_public_by_you">ທ່ານໄດ້ເປີດຫ້ອງສາທາລະນະໃຫ້ກັບທູຸກຄົນທີ່ຮູ້ຈັກລິ້ງ.</string>
+    <string name="room_join_rules_public">%1$s ໄດ້ກຳນົດຫ້ອງນີ້ໃຫ້ເປັນສາທາລະນະກັບກັບທຸກຄົນທີ່ຮູ້ຈັກລິ້ງ.</string>
+    <string name="help_long_click_on_room_for_more_options">ລອງກົດໃສ່ຫ້ອງເພື່ອເບິ່ງຕົວເລືອກເພີ່ມເຕີມ</string>
+    <string name="no_ignored_users">ທ່ານຍັງບໍ່ໄດ້ສົນໃຈຜູ້ໃຊ້ໃດໆ</string>
+    <string name="reaction_search_type_hint">ພິມຄໍາຫຼັກເພື່ອຊອກຫາການໂຕ້ຕອບ.</string>
+    <string name="spoiler">ຜູ້ເຮັດໃຫ້ເຊື່ອມເສຍ</string>
+    <string name="command_description_spoiler">ສົ່ງຂໍ້ຄວາມທີ່ໃຫ້ໄວ້ເປັນ spoiler</string>
+    <string name="notice_member_no_changes_by_you">ທ່ານບໍ່ມີການປ່ຽນແປງ</string>
+    <string name="notice_member_no_changes">%1$s ບໍ່ມີການປ່ຽນແປງ</string>
+    <string name="room_list_quick_actions_room_settings">ການຕັ້ງຄ່າຫ້ອງ</string>
+    <string name="room_list_quick_actions_leave">ອອກຈາກຫ້ອງ</string>
+    <string name="room_list_quick_actions_low_priority_remove">ລຶບອອກຈາກບູລິມະສິດຕໍ່າ</string>
+    <string name="room_list_quick_actions_low_priority_add">ຕື່ມລຳດັບບຸລິມະສິດຕໍ່າ</string>
+    <string name="room_list_quick_actions_favorite_remove">ລຶບອອກຈາກລາຍການທີ່ມັກ</string>
+    <string name="room_list_quick_actions_favorite_add">ເພີ່ມໃສ່ລາຍການທີ່ມັກ</string>
+    <string name="room_list_quick_actions_settings">ການຕັ້ງຄ່າ</string>
+    <string name="room_list_quick_actions_notifications_mute">ປິດສຽງ</string>
+    <string name="room_list_quick_actions_notifications_mentions">ກ່າວເຖິງເທົ່ານັ້ນ</string>
+    <string name="room_list_quick_actions_notifications_all">ຂໍ້ຄວາມທັງໝົດ</string>
+    <string name="room_list_quick_actions_notifications_all_noisy">ຂໍ້ຄວາມທັງໝົດ (ສຽງດັງ)</string>
+    <string name="message_ignore_user">ບໍ່ສົນໃຈຜູ້ໃຊ້</string>
+    <string name="content_reported_as_inappropriate_content">ເນື້ອຫານີ້ຖືກລາຍງານວ່າບໍ່ເໝາະສົມ.
+\n
+\nຖ້າຫາກວ່າທ່ານບໍ່ຕ້ອງການທີ່ຈະເບິ່ງເນື້ອໃນເພີ່ມເຕີມຈາກຜູ້ໃຊ້ນີ້, ທ່ານສາມາດບໍ່ສົນໃຈໃຫ້ເຂົາເຈົ້າເຊື່ອງຂໍ້ຄວາມຂອງເຂົາເຈົ້າ.</string>
+    <string name="content_reported_as_inappropriate_title">ລາຍງານວ່າບໍ່ເໝາະສົມ</string>
+    <string name="content_reported_as_spam_content">ເນື້ອຫານີ້ຖືກລາຍງານວ່າເປັນສະແປມ.
+\n
+\nຖ້າຫາກວ່າທ່ານບໍ່ຕ້ອງການທີ່ຈະເບິ່ງເນື້ອໃນເພີ່ມເຕີມຈາກຜູ້ໃຊ້ນີ້, ທ່ານສາມາດບໍ່ສົນໃຈໃຫ້ເຂົາເຈົ້າເຊື່ອງຂໍ້ຄວາມຂອງເຂົາເຈົ້າ.</string>
+    <string name="content_reported_as_spam_title">ລາຍງານວ່າເປັນ spam</string>
+    <string name="content_reported_content">ເນື້ອຫານີ້ໄດ້ຖືກລາຍງານ.
+\n
+\nຖ້າຫາກວ່າທ່ານບໍ່ຕ້ອງການທີ່ຈະເບິ່ງເນື້ອໃນເພີ່ມເຕີມຈາກຜູ້ໃຊ້ນີ້, ທ່ານສາມາດບໍ່ສົນໃຈໃຫ້ເຂົາເຈົ້າເຊື່ອງຂໍ້ຄວາມຂອງເຂົາເຈົ້າ.</string>
+    <string name="content_reported_title">ເນື້ອໃນທີ່ໄດ້ລາຍງານ</string>
+    <string name="block_user">ບໍ່ສົນໃຈຜູ້ໃຊ້</string>
+    <string name="report_content_custom_submit">ລາຍງານ</string>
+    <string name="report_content_custom_hint">ເຫດຜົນໃນການລາຍງານເນື້ອຫານີ້</string>
+    <string name="report_content_custom_title">ລາຍງານເນື້ອຫານີ້</string>
+    <string name="report_content_custom">ລາຍງານທີ່ກຳນົດເອງ…</string>
+    <string name="report_content_inappropriate">ບໍ່ເຫມາະສົມ</string>
+</resources>
diff --git a/vector/src/main/res/values-lv/strings.xml b/vector/src/main/res/values-lv/strings.xml
index 60426daa42..f308a32924 100644
--- a/vector/src/main/res/values-lv/strings.xml
+++ b/vector/src/main/res/values-lv/strings.xml
@@ -1526,7 +1526,7 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="call_resume_action">Turpināt</string>
     <string name="settings_call_ringtone_dialog_title">Izvēlieties zvana signālu:</string>
     <string name="settings_call_ringtone_title">Ienākoša zvana signāls</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Izmantot noklusējuma $ {app_name} zvana signālu ienākošajiem zvaniem</string>
+    <string name="settings_call_ringtone_use_app_ringtone">Izmantot noklusējuma ${app_name} zvana signālu ienākošajiem zvaniem</string>
     <string name="settings_call_show_confirmation_dialog_summary">Pirms zvana uzsākšanas lūgt apstiprinājumu</string>
     <string name="settings_call_show_confirmation_dialog_title">Novērst nejaušu zvanu</string>
     <string name="login_error_ssl_peer_unverified">SSL kļūda: Peer identitāte nav pārbaudīta.</string>
@@ -2102,4 +2102,4 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="denied_permission_voice_message">Lai sūtītu balss ziņojumus, piešķiriet Mikrofona atļauju.</string>
     <string name="spaces">Telpas</string>
     <string name="notification_listening_for_notifications">Uztver paziņojumus</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/vector/src/main/res/values-nl/strings.xml b/vector/src/main/res/values-nl/strings.xml
index a87aeefe2e..f567323fef 100644
--- a/vector/src/main/res/values-nl/strings.xml
+++ b/vector/src/main/res/values-nl/strings.xml
@@ -32,14 +32,13 @@
     <string name="notice_room_third_party_registered_invite">%1$s heeft de uitnodiging voor %2$s aanvaard</string>
     <string name="notice_crypto_unable_to_decrypt">** Kan niet ontsleutelen: %s **</string>
     <string name="notice_crypto_error_unknown_inbound_session_id">Het apparaat van de afzender heeft geen sleutels voor dit bericht gestuurd.</string>
-    <string name="unable_to_send_message">Kan bericht niet verzenden</string>
+    <string name="unable_to_send_message">Kan bericht niet versturen</string>
     <string name="matrix_error">Matrix-fout</string>
     <string name="medium_email">E-mailadres</string>
     <string name="medium_phone_number">Telefoonnummer</string>
     <string name="room_displayname_room_invite">Gespreksuitnodiging</string>
     <string name="room_displayname_two_members">%1$s en %2$s</string>
     <string name="room_displayname_empty_room">Leeg gesprek</string>
-
     <string name="initial_sync_start_importing_account">Initiële synchronisatie:
 \nAccount wordt geïmporteerd…</string>
     <string name="initial_sync_start_importing_account_crypto">Initiële synchronisatie:
@@ -101,7 +100,6 @@
     <string name="action_delete">Verwijderen</string>
     <string name="action_rename">Hernoemen</string>
     <string name="report_content">Inhoud melden</string>
-
     <string name="or">of</string>
     <string name="action_invite">Uitnodigen</string>
     <string name="action_sign_out">Afmelden</string>
@@ -124,7 +122,6 @@
     <string name="matrix_only_filter">Alleen Matrix-contacten</string>
     <string name="no_result_placeholder">Geen resultaten</string>
     <string name="rooms_header">Gesprekken</string>
-
     <string name="send_bug_report_include_logs">Logboek versturen</string>
     <string name="send_bug_report_include_crash_logs">Crash-logboek versturen</string>
     <string name="send_bug_report_include_screenshot">Schermafdruk versturen</string>
@@ -134,13 +131,13 @@
     <string name="send_bug_report_logs_description">Om het probleem te kunnen onderzoeken worden logboeken van deze cliënt met de foutmelding verstuurd. Deze foutmelding, inclusief de logboeken en schermafdruk, zullen niet openbaar zichtbaar zijn. Indien u liever alleen de bovenstaande tekst verstuurt, haal dan het vinkje weg:</string>
     <string name="send_bug_report_alert_message">Het ziet er naar uit dat u de telefoon in frustratie schudt. Wilt u een probleem melden\?</string>
     <string name="send_bug_report_sent">De foutmelding is verzonden</string>
-    <string name="send_bug_report_failed">Verzenden van foutmelding is mislukt (%s)</string>
+    <string name="send_bug_report_failed">Versturen van foutmelding is mislukt (%s)</string>
     <string name="send_bug_report_progress">Voortgang (%s%%)</string>
     <string name="send_bug_report_app_crashed">De toepassing is de vorige keer gecrasht. Wilt u dit melden\?</string>
     <string name="join_room">Gesprek toetreden</string>
-    <string name="username">Gebruikersnaam</string>
+    <string name="username">Inlognaam</string>
     <string name="logout">Afmelden</string>
-    <string name="hs_url">Thuisserver-URL</string>
+    <string name="hs_url">Server-URL</string>
     <string name="search">Zoeken</string>
     <string name="start_voice_call">Spraakoproep beginnen</string>
     <string name="start_video_call">Video-oproep beginnen</string>
@@ -148,15 +145,13 @@
     <string name="option_take_photo_video">Foto of video maken</string>
     <string name="auth_login">Aanmelden</string>
     <string name="auth_submit">Indienen</string>
-    <string name="auth_invalid_login_param">Verkeerde gebruikersnaam en/of wachtwoord</string>
+    <string name="auth_invalid_login_param">Verkeerde inlognaam en/of wachtwoord</string>
     <string name="auth_invalid_email">Dit is geen geldig e-mailadres</string>
     <string name="auth_email_already_defined">Dit e-mailadres is al in gebruik.</string>
     <string name="auth_forgot_password">Wachtwoord vergeten?</string>
-
-    <string name="auth_recaptcha_message">Deze thuisserver wil graag weten of u geen robot bent</string>
+    <string name="auth_recaptcha_message">Deze server wil graag weten of u geen robot bent</string>
     <string name="auth_reset_password_missing_email">Het e-mailadres dat aan uw account gekoppeld is moet ingevoerd worden.</string>
     <string name="auth_reset_password_error_unauthorized">Verifiëren van het e-mailadres is mislukt: zorg dat u op de koppeling in de e-mail hebt geklikt</string>
-
     <string name="login_error_invalid_home_server">Voer een geldige URL in</string>
     <string name="login_error_bad_json">Ongeldige JSON</string>
     <string name="login_error_not_json">Bevatte geen geldige JSON</string>
@@ -172,14 +167,10 @@
     <string name="call_in_progress">Oproep gaande…</string>
     <string name="call_error_user_not_responding">De andere kant heeft niet opgenomen.</string>
     <string name="permissions_rationale_popup_title">Informatie</string>
-
-
     <string name="permissions_rationale_msg_record_audio">${app_name} heeft toegang nodig tot uw microfoon om spraakoproepen te maken.</string>
-
     <string name="permissions_rationale_msg_camera_and_audio">${app_name} heeft toegang nodig tot uw camera en microfoon om video-oproepen te maken.
 \n
 \nVerleen toegang op de volgende pop-ups om de oproep te maken.</string>
-
     <string name="yes">JA</string>
     <string name="no">NEE</string>
     <string name="_continue">Verdergaan</string>
@@ -187,17 +178,16 @@
     <string name="action_join">Toetreden</string>
     <string name="action_reject">Afwijzen</string>
     <string name="room_jump_to_first_unread">Ga naar ongelezen</string>
-
     <string name="room_participants_leave_prompt_title">Gesprek verlaten</string>
     <string name="room_participants_leave_prompt_msg">Weet u zeker dat u het gesprek wilt verlaten\?</string>
     <string name="room_participants_header_direct_chats">TWEEGESPREKKEN</string>
     <string name="room_participants_action_invite">Uitnodigen</string>
     <string name="room_participants_action_ban">Verbannen</string>
     <string name="room_participants_action_unban">Ontbannen</string>
-    <string name="room_participants_action_ignore">Alle berichten van deze gebruiker verbergen</string>
-    <string name="room_participants_action_unignore">Alle berichten van deze gebruiker tonen</string>
+    <string name="room_participants_action_ignore">Alle berichten van deze persoon verbergen</string>
+    <string name="room_participants_action_unignore">Alle berichten van deze persoon tonen</string>
     <string name="room_participants_action_mention">Vermelden</string>
-    <string name="room_participants_power_level_prompt">U kunt deze veranderingen niet ongedaan maken aangezien u de gebruiker tot hetzelfde niveau als uzelf promoveert.
+    <string name="room_participants_power_level_prompt">U kunt deze veranderingen niet ongedaan maken aangezien u de persoon tot hetzelfde niveau als uzelf promoveert.
 \nWeet u het zeker\?</string>
     <string name="room_one_user_is_typing">%s is aan het typen…</string>
     <string name="room_two_users_are_typing">%1$s en %2$s zijn aan het typen…</string>
@@ -214,7 +204,6 @@
     <string name="ssl_unexpected_existing_expl">Het certificaat is veranderd van één dat door uw telefoon werd vertrouwd naar een ander. Dit is HEEL ONGEBRUIKELIJK. Het wordt aangeraden om dit nieuwe certificaat NIET TE AANVAARDEN.</string>
     <string name="ssl_expected_existing_expl">Het certificaat is veranderd van een vertrouwd naar een onvertrouwd certificaat. De server heeft misschien zijn certificaat vernieuwd. Contacteer de serverbeheerder voor de verwachte vingerafdruk.</string>
     <string name="ssl_only_accept">Aanvaard het certificaat alleen als de serverbeheerder een vingerafdruk heeft gepubliceerd die overeenkomt met degene hierboven.</string>
-
     <string name="search_hint">Zoeken</string>
     <string name="search_members_hint">Gespreksleden filteren</string>
     <string name="search_no_results">Geen resultaten</string>
@@ -241,9 +230,9 @@
     <string name="settings_copyright">Copyright</string>
     <string name="settings_privacy_policy">Privacybeleid</string>
     <string name="settings_clear_cache">Cache wissen</string>
-    <string name="settings_user_settings">Gebruikersinstellingen</string>
+    <string name="settings_user_settings">Persoonsinstellingen</string>
     <string name="settings_notifications">Meldingen</string>
-    <string name="settings_ignored_users">Genegeerde gebruikers</string>
+    <string name="settings_ignored_users">Genegeerde personen</string>
     <string name="settings_other">Overige</string>
     <string name="settings_advanced">Geavanceerd</string>
     <string name="settings_cryptography">Cryptografie</string>
@@ -259,10 +248,9 @@
     <string name="devices_details_device_name">Publieke naam bijwerken</string>
     <string name="devices_details_last_seen_title">Laatst gezien</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
-
     <string name="devices_delete_dialog_title">Authenticatie</string>
     <string name="settings_logged_in">Aangemeld als</string>
-    <string name="settings_home_server">Thuisserver</string>
+    <string name="settings_home_server">Server</string>
     <string name="settings_identity_server">Identiteitsserver</string>
     <string name="account_email_validation_message">Bekijk uw e-mail en tik op de koppeling erin. Tik zodra dit gedaan is op Verdergaan.</string>
     <string name="account_email_already_used_error">Dit e-mailadres is al in gebruik.</string>
@@ -283,14 +271,13 @@
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Alleen deelnemers (vanaf het moment dat deze optie wordt geselecteerd)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Alleen deelnemers (vanaf het moment dat ze worden uitgenodigd)</string>
     <string name="room_settings_read_history_entry_members_only_joined">Alleen deelnemers (vanaf het moment dat ze toetreden)</string>
-    <string name="room_settings_banned_users_title">Verbannen gebruikers</string>
+    <string name="room_settings_banned_users_title">Verbannen personen</string>
     <string name="room_settings_category_advanced_title">Geavanceerd</string>
     <string name="room_settings_room_internal_id">Interne ID van dit gesprek</string>
     <string name="room_settings_labs_pref_title">Experimenteel</string>
     <string name="room_settings_labs_warning_message">Dit zijn experimentele functies die zich op onverwachte manieren kunnen gedragen. Wees behoedzaam bij het gebruik van deze functies.</string>
     <string name="room_settings_set_main_address">Instellen als hoofdadres</string>
     <string name="room_settings_unset_main_address">Niet instellen als hoofdadres</string>
-
     <string name="encryption_information_decryption_error">Ontsleutelingsfout</string>
     <string name="encryption_information_device_name">Publieke naam</string>
     <string name="encryption_information_device_id">Sessie ID</string>
@@ -301,7 +288,6 @@
     <string name="encryption_export_export">Exporteren</string>
     <string name="passphrase_enter_passphrase">Voer wachtwoord in</string>
     <string name="passphrase_confirm_passphrase">Wachtwoord bevestigen</string>
-
     <string name="encryption_import_e2e_room_keys">E2E-gesprekssleutels importeren</string>
     <string name="encryption_import_room_keys">Gesprekssleutels importeren</string>
     <string name="encryption_import_room_keys_summary">Importeer de sleutels uit een lokaal bestand</string>
@@ -311,11 +297,10 @@
     <string name="encryption_information_not_verified">NIET geverifieerd</string>
     <string name="encryption_information_verified">Geverifieerd</string>
     <string name="encryption_information_verify">Verifiëren</string>
-    <string name="encryption_information_verify_device_warning">Om te verifiëren dat deze sessie vertrouwd kan worden, contacteert u de eigenaar via een andere methode (bv. persoonlijk of via een telefoontje) en vraagt u hem/haar of de sleutel die hij/zij ziet in zijn/haar Gebruikersinstellingen van deze sessie overeenkomt met de sleutel hieronder:</string>
+    <string name="encryption_information_verify_device_warning">Om te verifiëren dat deze sessie vertrouwd kan worden, contacteert u de eigenaar via een andere methode (bv. persoonlijk of via een telefoontje) en vraagt u hem/haar of de sleutel die hij/zij ziet in zijn/haar persoonsinstellingen van deze sessie overeenkomt met de sleutel hieronder:</string>
     <string name="encryption_information_verify_device_warning2">Als het overeenkomt, drukt u op de knop ‘Verifiëren’ hieronder. Als het niet overeenkomt, dan onderschept iemand anders deze sessie en zou u het beter blokkeren. In de toekomst zal dit verificatieproces verbeterd worden.</string>
-
     <string name="select_room_directory">Kies een gesprekscatalogus</string>
-    <string name="directory_server_placeholder">Thuisserver-naam</string>
+    <string name="directory_server_placeholder">Servernaam</string>
     <string name="directory_server_all_rooms_on_server">Alle gesprekken op server %s</string>
     <string name="directory_server_native_rooms">Alle lokale gesprekken op %s</string>
     <string name="settings_start_on_boot">Starten bij opstarten</string>
@@ -361,7 +346,7 @@
     <string name="option_take_video">Video maken</string>
     <string name="call">Bellen</string>
     <string name="settings_containing_my_display_name">Berichten die mijn weergavenaam bevatten</string>
-    <string name="settings_containing_my_user_name">Berichten die mijn gebruikersnaam bevatten</string>
+    <string name="settings_containing_my_user_name">Berichten die mijn inlognaam bevatten</string>
     <string name="settings_analytics">Statistische gegevens</string>
     <string name="settings_labs_native_camera">Systeemcamera gebruiken</string>
     <string name="you_added_a_new_device">U heeft een nieuwe sessie ‘%s’ toegevoegd, die versleutelingssleutels aanvraagt.</string>
@@ -381,25 +366,21 @@
         <item quantity="one">%d verandering in lidmaatschap</item>
         <item quantity="other">%d veranderingen in lidmaatschap</item>
     </plurals>
-    <string name="list_members">Ledenlijst</string>
-
+    <string name="list_members">Leden</string>
     <plurals name="room_title_members">
         <item quantity="one">%d deelnemer</item>
         <item quantity="other">%d deelnemers</item>
     </plurals>
-    <string name="room_participants_ban_prompt_msg">Als een gebruiker wordt verbannen, wordt deze uit deze kamer verwijderd en wordt er voorkomen dat hij opnieuw lid wordt.</string>
+    <string name="room_participants_ban_prompt_msg">Als een persoon wordt verbannen, wordt deze uit deze kamer verwijderd en wordt er voorkomen dat hij opnieuw lid wordt.</string>
     <plurals name="room_new_messages_notification">
         <item quantity="one">%d nieuw bericht</item>
         <item quantity="other">%d nieuwe berichten</item>
     </plurals>
-
-
     <string name="room_settings_all_messages">Alle berichten</string>
     <string name="room_settings_add_homescreen_shortcut">Snelkoppeling aan thuisscherm toevoegen</string>
     <string name="settings_inline_url_preview">Inline URL-voorvertoning</string>
-    <string name="settings_vibrate_on_mention">Trillen bij vermelden van een gebruiker</string>
+    <string name="settings_vibrate_on_mention">Trillen bij vermelden van een persoon</string>
     <string name="settings_flair">Badge</string>
-
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="one">%d gesprek</item>
         <item quantity="other">%d gesprekken</item>
@@ -431,15 +412,15 @@
     <string name="settings_opt_in_of_analytics">Statistische gegevens (analytics) versturen</string>
     <string name="settings_opt_in_of_analytics_summary">${app_name} verzamelt anonieme statistische gegevens (analytics) om het voor ons mogelijk te maken om de app te verbeteren.</string>
     <string name="widget_integration_missing_parameter">Er ontbreekt een vereiste parameter.</string>
-    <string name="dialog_user_consent_content">Om de %1$s-thuisserver verder te blijven gebruiken, dient u de voorwaarden te lezen en ermee akkoord te gaan.</string>
+    <string name="dialog_user_consent_content">Om de %1$s-server verder te blijven gebruiken, dient u de voorwaarden te lezen en ermee akkoord te gaan.</string>
     <string name="dialog_user_consent_submit">Nu doorlezen</string>
     <string name="deactivate_account_title">Account deactiveren</string>
-    <string name="deactivate_account_content">Dit zal uw account voorgoed onbruikbaar maken. U zult zich niet meer kunnen aanmelden, en niemand anders zal met dezelfde gebruikers-ID kunnen registreren. Dit zal er voor zorgen dat uw account alle gesprekken verlaat waar deze momenteel lid van is, en het verwijdert de accountgegevens van de identiteitsserver. <b>Deze actie is onomkeerbaar.</b> 
-\n 
-\nHet deactiveren van uw account <b>zal er niet standaard voor zorgen dat de berichten die u hebt verzonden worden vergeten.</b> Indien u wilt dat wij de berichten vergeten, vinkt u het vakje hieronder aan. 
-\n 
+    <string name="deactivate_account_content">Dit zal uw account voorgoed onbruikbaar maken. U zult zich niet meer kunnen aanmelden, en niemand anders zal met dezelfde persoon-ID kunnen registreren. Dit zal er voor zorgen dat uw account alle gesprekken verlaat waar deze momenteel lid van is, en het verwijdert de accountgegevens van de identiteitsserver. <b>Deze actie is onomkeerbaar.</b>
+\n
+\nHet deactiveren van uw account <b>zal er niet standaard voor zorgen dat de berichten die u hebt verzonden worden vergeten.</b> Indien u wilt dat wij de berichten vergeten, vinkt u het vakje hieronder aan.
+\n
 \nDe zichtbaarheid van berichten in Matrix is gelijkaardig aan e-mails. Het vergeten van uw berichten betekent dat berichten die u verstuurd heeft niet meer gedeeld worden met nieuwe of ongeregistreerde gebruikers, maar geregistreerde gebruikers die al toegang hebben tot deze berichten zullen alsnog toegang hebben tot hun eigen kopie ervan.</string>
-    <string name="deactivate_account_delete_checkbox">Vergeet alle berichten die ik heb verstuurd wanneer mijn account gedeactiveerd is (<b>Let op:</b> dit zal er voor zorgen dat toekomstige gebruikers een onvolledig beeld krijgen van gesprekken)</string>
+    <string name="deactivate_account_delete_checkbox">Vergeet alle berichten die ik heb verstuurd wanneer mijn account gedeactiveerd is (<b>Let op:</b> dit zal er voor zorgen dat toekomstige personen een onvolledig beeld krijgen van gesprekken)</string>
     <string name="deactivate_account_submit">Account deactiveren</string>
     <string name="action_download">Downloaden</string>
     <string name="e2e_re_request_encryption_key">Beveiligingssleutels van uw sessies <u>opnieuw aanvragen</u>.</string>
@@ -450,15 +431,15 @@
     <string name="send_bug_report_description_in_english">Beschrijf het probleem in het Engels, indien mogelijk.</string>
     <string name="settings_preview_media_before_sending">Media bekijken vóór het versturen</string>
     <string name="command_description_emote">Toont een actie</string>
-    <string name="command_description_ban_user">Verbant gebruiker met gegeven ID</string>
-    <string name="command_description_unban_user">Heft verbanning van gebruiker met gegeven ID op</string>
-    <string name="command_description_op_user">Stel het machtsniveau van een gebruiker in</string>
-    <string name="command_description_deop_user">Neemt rechten van gebruiker met gegeven ID af</string>
-    <string name="command_description_invite_user">Nodigt gebruiker met gegeven ID uit in het huidige gesprek</string>
+    <string name="command_description_ban_user">Verbant persoon met gegeven ID</string>
+    <string name="command_description_unban_user">Heft verbanning van persoon met gegeven ID op</string>
+    <string name="command_description_op_user">Stel het machtsniveau van een persoon in</string>
+    <string name="command_description_deop_user">Neemt rechten van persoon met gegeven ID af</string>
+    <string name="command_description_invite_user">Nodigt persoon met gegeven ID uit in het huidige gesprek</string>
     <string name="command_description_join_room">Voegt een kamer toe met het opgegeven adres</string>
     <string name="command_description_part_room">Gesprek verlaten</string>
     <string name="command_description_topic">Onderwerp van het gesprek instellen</string>
-    <string name="command_description_remove_user">Stuurt gebruiker met gegeven ID eruit</string>
+    <string name="command_description_remove_user">Stuurt persoon met gegeven ID eruit</string>
     <string name="command_description_nick">Wijzigt uw weergavenaam</string>
     <string name="command_description_markdown">Markdown aan/uit</string>
     <string name="room_tombstone_versioned_description">Dit gesprek is vervangen en is niet langer actief.</string>
@@ -466,35 +447,29 @@
     <string name="room_tombstone_continuation_description">Dit gesprek is een voortzetting van een ander gesprek</string>
     <string name="room_tombstone_predecessor_link">Klik hier om oudere berichten te zien</string>
     <string name="system_alerts_header">Systeemmeldingen</string>
-
-
-
-
     <plurals name="room_details_selected">
         <item quantity="one">%d geselecteerd</item>
         <item quantity="other">%d geselecteerd</item>
     </plurals>
     <string name="command_description_clear_scalar_token">Om Matrix-appbeheer te herstellen</string>
-
-
     <string name="resource_limit_contact_admin">contact op te nemen met uw dienstbeheerder</string>
-    <string name="resource_limit_soft_default">Deze thuisserver heeft een van zijn bronlimieten overschreden, dus <b>sommige gebruikers zullen zich niet kunnen aanmelden</b>.</string>
-    <string name="resource_limit_hard_default">Deze thuisserver heeft een van zijn bronlimieten overschreden.</string>
-    <string name="resource_limit_soft_mau"> Deze thuisserver heeft zijn limiet voor maandelijks actieve gebruikers overschreden, dus <b>sommige gebruikers zullen zich niet kunnen aanmelden</b>.</string>
-    <string name="resource_limit_hard_mau">Deze thuisserver heeft zijn limiet voor maandelijks actieve gebruikers overschreden.</string>
+    <string name="resource_limit_soft_default">Deze server heeft een van zijn bronlimieten overschreden, dus <b>sommige personen zullen zich niet kunnen aanmelden</b>.</string>
+    <string name="resource_limit_hard_default">Deze server heeft een van zijn bronlimieten overschreden.</string>
+    <string name="resource_limit_soft_mau"> Deze server heeft zijn limiet voor maandelijks actieve personen overschreden, dus <b>sommige personen zullen zich niet kunnen aanmelden</b>.</string>
+    <string name="resource_limit_hard_mau">Deze server heeft zijn limiet voor maandelijks actieve personen overschreden.</string>
     <string name="resource_limit_soft_contact">Gelieve %s om deze limiet te verhogen.</string>
     <string name="resource_limit_hard_contact">Gelieve %s om deze dienst te blijven gebruiken.</string>
     <string name="dialog_title_error">Foutmelding</string>
     <string name="action_accept">Aanvaarden</string>
-    <string name="auth_accept_policies">Gelieve het beleid van deze thuisserver te lezen en aanvaarden:</string>
+    <string name="auth_accept_policies">Gelieve het beleid van deze server te lezen en aanvaarden:</string>
     <string name="settings_call_category">Oproepen</string>
     <string name="settings_call_ringtone_use_app_ringtone">Gebruik de standaardbeltoon van ${app_name} voor inkomende oproepen</string>
     <string name="settings_call_ringtone_title">Beltoon voor inkomende oproepen</string>
     <string name="settings_call_ringtone_dialog_title">Selecteer beltoon voor oproepen:</string>
     <string name="room_participants_action_remove">Eruit sturen</string>
-    <string name="settings_inline_url_preview_summary">Voorvertoning van koppelingen in het gesprek tonen (als uw thuisserver deze functie ondersteunt).</string>
+    <string name="settings_inline_url_preview_summary">Voorvertoning van koppelingen in het gesprek tonen (als uw server deze functie ondersteunt).</string>
     <string name="settings_send_typing_notifs">Typmeldingen versturen</string>
-    <string name="settings_send_typing_notifs_summary">Laat andere gebruikers weten dat u aan het typen bent.</string>
+    <string name="settings_send_typing_notifs_summary">Laat andere personen weten dat u aan het typen bent.</string>
     <string name="settings_send_markdown">Markdown-opmaak</string>
     <string name="settings_send_markdown_summary">Maak berichten op met Markdown-syntax voordat ze verstuurd worden. Hiermee kunt u uitgebreide opmaak gebruiken, zoals sterretjes voor schuingedrukte tekst.</string>
     <string name="settings_show_read_receipts">Leesbevestigingen weergeven</string>
@@ -558,15 +533,15 @@
     <string name="settings_troubleshoot_test_fcm_failed">Het FCM-bewijs is niet opgehaald:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nDeze fout is onafhankelijk van ${app_name}. Volgens Google betekent deze fout dat het apparaat te veel apps heeft geregistreerd met FCM. De fout treedt enkel op ingeval er een enorm aantal apps is, dus zou dit de gemiddelde gebruiker niet mogen hinderen.</string>
+\nDeze fout is onafhankelijk van ${app_name}. Volgens Google betekent deze fout dat het apparaat te veel apps heeft geregistreerd met FCM. De fout treedt enkel op ingeval er een enorm aantal apps is, dus zou dit de gemiddelde persoon niet mogen hinderen.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
 \nDeze fout is onafhankelijk van ${app_name}. Ze kan verschillende oorzaken hebben. Misschien werkt het als u het later opnieuw probeert. U kunt ook controleren of het gegevensverbruik van Google Play Services niet wordt beperkt in de systeeminstellingen, of dat de klok van uw apparaat wel juist staat, of dat het misschien aan een aangepaste ROM ligt.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
 \nDeze fout is onafhankelijk van ${app_name}. Er is geen Google-account verbonden met de telefoon. Open het accountbeheer en voeg er een Google-account toe.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Account toevoegen</string>
     <string name="settings_troubleshoot_test_token_registration_title">Bewijsregistratie</string>
-    <string name="settings_troubleshoot_test_token_registration_success">FCM-bewijs geregistreerd bij thuisserver.</string>
-    <string name="settings_troubleshoot_test_token_registration_failed">FCM-bewijs niet geregistreerd bij thuisserver:
+    <string name="settings_troubleshoot_test_token_registration_success">FCM-bewijs geregistreerd bij server.</string>
+    <string name="settings_troubleshoot_test_token_registration_failed">FCM-bewijs niet geregistreerd bij server:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_service_boot_title">Starten bij opstarten van apparaat</string>
     <string name="settings_troubleshoot_test_service_boot_success">De dienst zal starten wanneer het apparaat wordt herstart.</string>
@@ -581,7 +556,7 @@
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Beperkingen uitschakelen</string>
     <string name="settings_troubleshoot_test_battery_title">Accuoptimalisatie</string>
     <string name="settings_troubleshoot_test_battery_success">${app_name} wordt niet beperkt door accuoptimalisatie.</string>
-    <string name="settings_troubleshoot_test_battery_failed">Als een gebruiker een apparaat los van de oplader een tijd laat stilliggen, met het scherm uitgeschakeld, gaat het apparaat in slaapmodus. Dit verhindert apps de toegang tot het netwerk, en stelt hun taken, synchronisaties en standaardalarmen uit.</string>
+    <string name="settings_troubleshoot_test_battery_failed">Als een persoon een apparaat los van de oplader een tijd laat stilliggen, met het scherm uitgeschakeld, gaat het apparaat in slaapmodus. Dit verhindert apps de toegang tot het netwerk, en stelt hun taken, synchronisaties en standaardalarmen uit.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Optimalisatie negeren</string>
     <string name="settings_noisy_notifications_preferences">Lawaaiierige meldingen configureren</string>
     <string name="settings_call_notifications_preferences">Oproepmeldingen configureren</string>
@@ -590,7 +565,6 @@
     <string name="settings_cryptography_manage_keys">Beheer van cryptografische sleutels</string>
     <string name="settings_send_message_with_enter">Berichten versturen met Enter</string>
     <string name="settings_send_message_with_enter_summary">De Enter-knop van het toetsenbord zal berichten versturen in plaats van een regeleinde in te voegen</string>
-
     <string name="settings_password">Wachtwoord</string>
     <string name="settings_fail_to_update_password_invalid_current_password">Het wachtwoord is ongeldig</string>
     <string name="settings_media">Media</string>
@@ -621,7 +595,7 @@
     <string name="markdown_has_been_enabled">Markdown is ingeschakeld.</string>
     <string name="markdown_has_been_disabled">Markdown is uitgeschakeld.</string>
     <string name="notification_silent">Stil</string>
-    <string name="error_empty_field_enter_user_name">Voer een gebruikersnaam in.</string>
+    <string name="error_empty_field_enter_user_name">Voer een inlognaam in.</string>
     <string name="unknown_error">Sorry, er is een fout opgetreden</string>
     <string name="merged_events_expand">uitvouwen</string>
     <string name="merged_events_collapse">invouwen</string>
@@ -641,7 +615,7 @@
     <string name="keys_backup_setup_step1_advanced">(Geavanceerd)</string>
     <string name="keys_backup_setup_step1_manual_export">Sleutels handmatig exporteren</string>
     <string name="keys_backup_setup_step2_text_title">Beveilig uw back-up met een wachtwoord.</string>
-    <string name="keys_backup_setup_step2_text_description">We bewaren een versleutelde kopie van uw sleutels op onze thuisserver. Bescherm uw back-up met een wachtwoord om deze veilig te houden.
+    <string name="keys_backup_setup_step2_text_description">We bewaren een versleutelde kopie van uw sleutels op onze server. Bescherm uw back-up met een wachtwoord om deze veilig te houden.
 \n
 \nVoor een maximale beveiliging zou deze sleutel moeten verschillen van uw accountwachtwoord.</string>
     <string name="keys_backup_setup_step2_button_title">Wachtwoord instellen</string>
@@ -658,7 +632,6 @@
     <string name="keys_backup_setup_step3_copy_button_title">Herstelsleutel opslaan</string>
     <string name="keys_backup_setup_step3_share_recovery_file">Delen</string>
     <string name="keys_backup_setup_step3_save_button_title">Opslaan als bestand</string>
-
     <string name="keys_backup_setup_step3_please_make_copy">Gelieve er een kopie van te maken</string>
     <string name="keys_backup_setup_step3_share_intent_chooser_title">Herstelsleutel delen met…</string>
     <string name="keys_backup_setup_step3_generating_key_status">Herstelsleutel wordt gegenereerd met wachtwoord, dit proces kan enkele seconden duren.</string>
@@ -706,7 +679,6 @@
     <string name="keys_backup_settings_deleting_backup">Back-up wordt verwijderd…</string>
     <string name="keys_backup_settings_delete_confirm_title">Back-up verwijderen</string>
     <string name="keys_backup_settings_delete_confirm_message">Uw geback-upte versleutelingssleutels verwijderen van de server\? U zult uw herstelsleutel niet meer kunnen gebruiken om de versleutelde berichtgeschiedenis te lezen.</string>
-
     <string name="keys_backup_banner_recover_line1">Verlies nooit uw versleutelde berichten</string>
     <string name="keys_backup_banner_recover_line2">Sleutelback-up gebruiken</string>
     <string name="keys_backup_banner_update_line1">Nieuwe sleutels voor versleutelde berichten</string>
@@ -720,7 +692,6 @@
     <string name="keys_backup_info_title_version">Versie</string>
     <string name="keys_backup_info_title_algorithm">Algoritme</string>
     <string name="keys_backup_info_title_signature">Ondertekening</string>
-
     <string name="error_jitsi_not_supported_on_old_device">Sorry, vergadergesprekken met Jitsi worden nog niet ondersteund op oudere apparaten (met een Android-versie lager dan 6.0)</string>
     <string name="encryption_information_unknown_ip">onbekend IP-adres</string>
     <string name="you_added_a_new_device_with_info">Een nieuwe sessie vraagt versleutelingssleutels aan. 
@@ -736,8 +707,6 @@
     <string name="ignore_request_short_label">Negeren</string>
     <string name="sas_verified">Geverifieerd!</string>
     <string name="sas_got_it">Ik snap het</string>
-
-
     <string name="sas_incoming_request_notif_title">Verificatieverzoek</string>
     <string name="sas_incoming_request_notif_content">%s wil uw sessie verifiëren</string>
     <string name="sas_error_unknown">Onbekende fout</string>
@@ -745,9 +714,8 @@
     <string name="action_revoke">Intrekken</string>
     <string name="action_disconnect">Verbinding verbreken</string>
     <string name="action_decline">Weigeren</string>
-
     <string name="login_error_no_homeserver_found">Dit is geen geldig Matrix-serveradres</string>
-    <string name="login_error_homeserver_not_found">Kan geen verbinding maken met een thuisserver op deze URL, controleer de URL</string>
+    <string name="login_error_homeserver_not_found">Kan geen verbinding maken met een server op deze URL, controleer de URL</string>
     <string name="settings_background_fdroid_sync_mode">Synchroniseren op de achtergrond</string>
     <string name="settings_background_fdroid_sync_mode_battery">Geoptimaliseerd voor batterij</string>
     <string name="settings_background_fdroid_sync_mode_battery_description">${app_name} zal op een batterijzuinige manier synchroniseren op de achtergrond.
@@ -757,7 +725,6 @@
 \nDit heeft een negatieve impact op uw batterij- en datagebruik. Er zal een melding getoond worden ter informatie.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Geen achtergrondssynchronisatie</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">U zal geen melding van berichten ontvangen als de app zich in de achtergrond bevindt.</string>
-
     <string name="settings_integrations">Integraties</string>
     <string name="settings_integrations_summary">Gebruik een integratiebeheerder om bots, bruggen, widgets en stickerpakketten te beheren.
 \nIntegratiebeheerders ontvangen configuratiedata en kunnen widgets aanpassen, gespreksuitnodigingen versturen en bestuursniveaus instellen namens u.</string>
@@ -777,7 +744,7 @@
     <string name="room_widget_revoke_access">Toegang intrekken voor mij</string>
     <string name="room_widget_permission_display_name">Uw weergavenaam</string>
     <string name="room_widget_permission_avatar_url">Uw profielfoto-URL</string>
-    <string name="room_widget_permission_user_id">Uw gebruikers-ID</string>
+    <string name="room_widget_permission_user_id">Uw persoon-ID</string>
     <string name="room_widget_permission_theme">Uw thema</string>
     <string name="room_widget_permission_widget_id">Widget-ID</string>
     <string name="room_widget_permission_room_id">Gespreks-ID</string>
@@ -788,13 +755,13 @@
     <string name="room_widget_webview_access_microphone">Microfoon gebruiken</string>
     <string name="room_widget_webview_read_protected_media">DRM-beschermde media lezen</string>
     <string name="widget_integration_review_terms">Om verder te gaan dient u de dienstvoorwaarden te aanvaarden.</string>
-    <string name="keys_backup_setup_override_backup_prompt_tile">Er bestaat al een back-up op uw thuisserver</string>
+    <string name="keys_backup_setup_override_backup_prompt_tile">Er bestaat al een back-up op uw server</string>
     <string name="keys_backup_setup_override_backup_prompt_description">Het lijkt erop dat u al een back-up van uw herstelsleutel heeft uit een andere sessie. Wilt u deze vervangen door degene die u nu aanmaakt\?</string>
     <string name="keys_backup_setup_override_replace">Vervangen</string>
     <string name="keys_backup_setup_override_stop">Stoppen</string>
     <string name="keys_backup_settings_checking_backup_state">Back-upstatus wordt gecontroleerd</string>
     <string name="identity_server_not_defined">U gebruikt geen identiteitsserver</string>
-    <string name="error_user_already_logged_in">Het lijkt er op dat u probeert verbinding te maken met een andere thuisserver. Wil je uitloggen\?</string>
+    <string name="error_user_already_logged_in">Het lijkt er op dat u probeert verbinding te maken met een andere server. Wil je uitloggen\?</string>
     <string name="edit">Bewerken</string>
     <string name="reply">Beantwoorden</string>
     <string name="global_retry">Opnieuw proberen</string>
@@ -811,7 +778,7 @@
     <string name="message_add_reaction">Reactie Toevoegen</string>
     <string name="message_view_reaction">Reacties Bekijken</string>
     <string name="reactions">Reacties</string>
-    <string name="event_redacted_by_user_reason">Gebeurtenis verwijderd door gebruiker</string>
+    <string name="event_redacted_by_user_reason">Gebeurtenis verwijderd door persoon</string>
     <string name="event_redacted_by_admin_reason">Gebeurtenis gemodereerd door gesprek beheerder</string>
     <string name="malformed_message">Niet correcte gebeurtenis, kan niet weergeven</string>
     <string name="create_new_room">Maak een nieuw gesprek aan</string>
@@ -914,7 +881,7 @@
     <string name="notice_direct_room_join">%1$s sluit aan</string>
     <string name="notice_room_join_by_you">U heeft de kamer betreden</string>
     <string name="voice_message_tap_to_stop_toast">Druk op uw opname om te stoppen of om te luisteren</string>
-    <string name="voice_message_release_to_send_toast">Houd ingedrukt om op te nemen, laat los om te verzenden</string>
+    <string name="voice_message_release_to_send_toast">Houd ingedrukt om op te nemen, laat los om te versturen</string>
     <string name="a11y_delete_recorded_voice_message">Verwijder opname</string>
     <string name="a11y_recording_voice_message">Stembericht aan het opnemen</string>
     <string name="a11y_pause_voice_message">Pauzeer stembericht</string>
@@ -989,8 +956,8 @@
     <string name="power_level_edit_title">Rol instellen</string>
     <string name="identity_server_set_default_submit">%1$s gebruiken</string>
     <string name="choose_locale_current_locale_title">Huidige taal</string>
-    <string name="invite_users_to_room_title">Gebruikers Uitnodigen</string>
-    <string name="inviting_users_to_room">Gebruikers uitnodigen…</string>
+    <string name="invite_users_to_room_title">Personen uitnodigen</string>
+    <string name="inviting_users_to_room">Personen uitnodigen…</string>
     <string name="add_members_to_room">Leden toevoegen</string>
     <string name="crosssigning_verify_session">Login bevestigen</string>
     <string name="use_file">Bestand Gebruiken</string>
@@ -1045,9 +1012,9 @@
     <string name="soft_logout_signin_title">Inloggen</string>
     <string name="seen_by">Gezien door</string>
     <string name="login_signin_matrix_id_hint">Matrix-ID</string>
-    <string name="login_error_outdated_homeserver_title">Verouderde thuisserver</string>
+    <string name="login_error_outdated_homeserver_title">Verouderde server</string>
     <string name="login_a11y_choose_matrix_org">Selecteer matrix.org</string>
-    <string name="login_msisdn_confirm_send_again">Opnieuw verzenden</string>
+    <string name="login_msisdn_confirm_send_again">Opnieuw versturen</string>
     <string name="login_msisdn_confirm_hint">Code invoeren</string>
     <string name="login_set_msisdn_mandatory_hint">Telefoonnummer</string>
     <string name="login_set_email_optional_hint">Email (optioneel)</string>
@@ -1058,23 +1025,23 @@
     <string name="timeline_unread_messages">Ongelezen berichten</string>
     <string name="room_list_quick_actions_notifications_mentions">Alleen vermeldingen</string>
     <string name="settings_secure_backup_section_title">Beveiligde Backup</string>
-    <string name="room_participants_unban_title">Verbanning gebruiker ongedaan maken</string>
-    <string name="room_participants_ban_title">Gebruiker verbannen</string>
-    <string name="room_participants_remove_title">Gebruiker verwijderen</string>
+    <string name="room_participants_unban_title">Verbanning persoon ongedaan maken</string>
+    <string name="room_participants_ban_title">Persoon verbannen</string>
+    <string name="room_participants_remove_title">Persoon verwijderen</string>
     <string name="room_participants_action_cancel_invite_title">Uitnodiging annuleren</string>
-    <string name="room_participants_action_unignore_title">Gebruiker niet meer negeren</string>
+    <string name="room_participants_action_unignore_title">Persoon niet meer negeren</string>
     <string name="sent_a_voice_message">Stem</string>
     <string name="settings_server_room_version_unstable">onstabiel</string>
     <string name="settings_server_room_version_stable">stabiel</string>
     <string name="room_list_quick_actions_notifications_all">Alle berichten</string>
-    <string name="message_ignore_user">Gebruiker negeren</string>
+    <string name="message_ignore_user">Persoon negeren</string>
     <string name="content_reported_title">Inhoud gerapporteerd</string>
-    <string name="block_user">GEBRUIKER NEGEREN</string>
+    <string name="block_user">PERSOON NEGEREN</string>
     <string name="report_content_custom">Aangepast rapport…</string>
     <string name="report_content_inappropriate">Dit is ongepast</string>
     <string name="report_content_spam">Dit is spam</string>
     <string name="one_user_read">Gelezen door %s</string>
-    <string name="send_attachment">Bijlage verzenden</string>
+    <string name="send_attachment">Bijlage versturen</string>
     <string name="identity_server">Identiteitsserver</string>
     <string name="creating_direct_room">Kamer aanmaken…</string>
     <string name="room_filtering_filter_hint">Gesprekken filteren…</string>
@@ -1095,7 +1062,7 @@
     <string name="settings_mentions_at_room">\@room</string>
     <string name="settings_notification_other">Overige</string>
     <string name="room_settings_none">Geen</string>
-    <string name="room_participants_action_ignore_title">Gebruiker negeren</string>
+    <string name="room_participants_action_ignore_title">Persoon negeren</string>
     <string name="room_participants_power_level_demote_warning_title">Uzelf degraderen\?</string>
     <string name="room_participants_action_cancel_invite">Uitnodiging annuleren</string>
     <string name="call_hold_action">In de wacht zetten</string>
@@ -1113,7 +1080,7 @@
     <string name="space_type_public">Publiek</string>
     <string name="event_status_a11y_failed">Mislukt</string>
     <string name="event_status_a11y_sent">Verzonden</string>
-    <string name="event_status_a11y_sending">Verzenden</string>
+    <string name="event_status_a11y_sending">Versturen</string>
     <string name="dev_tools_form_hint_type">Type</string>
     <string name="a11y_unchecked">Ongecontroleerd</string>
     <string name="a11y_checked">Gecontroleerd</string>
@@ -1121,7 +1088,7 @@
     <string name="a11y_video">Video</string>
     <string name="a11y_image">Afbeelding</string>
     <string name="a11y_screenshot">Schermafbeelding</string>
-    <string name="call_transfer_users_tab_title">Gebruikers</string>
+    <string name="call_transfer_users_tab_title">Personen</string>
     <string name="call_transfer_title">Overdragen</string>
     <string name="call_transfer_connect_action">Verbinden</string>
     <string name="room_settings_topic_hint">Onderwerp</string>
@@ -1159,7 +1126,7 @@
     <string name="encryption_information_cross_signing_state">Gekruist Ondertekenen</string>
     <string name="settings_category_timeline">Tijdlijn</string>
     <string name="unignore">Negeren opheffen</string>
-    <string name="room_member_power_level_users">Gebruikers</string>
+    <string name="room_member_power_level_users">Personen</string>
     <string name="room_member_power_level_invites">Genodigden</string>
     <string name="room_member_power_level_custom">Aangepast</string>
     <string name="room_member_power_level_moderators">Moderatoren</string>
@@ -1181,7 +1148,7 @@
     <string name="login_signup_cancel_confirmation_title">Waarschuwing</string>
     <string name="login_signup_submit">Volgende</string>
     <string name="login_signup_password_hint">Wachtwoord</string>
-    <string name="login_signup_username_hint">Gebruikersnaam</string>
+    <string name="login_signup_username_hint">Inlognaam</string>
     <string name="login_msisdn_confirm_submit">Volgende</string>
     <string name="login_set_msisdn_submit">Volgende</string>
     <string name="login_set_email_submit">Volgende</string>
@@ -1265,30 +1232,32 @@
     <string name="login_splash_submit">Aan de slag</string>
     <string name="space_settings_permissions_title">Spacerechten</string>
     <string name="room_settings_permissions_title">Gespreksrechten</string>
-    <string name="space_participants_unban_prompt_msg">Door deze gebruiker niet meer de verbannen kan hij/zij opnieuw toetreden tot de space.</string>
-    <string name="room_participants_unban_prompt_msg">Door deze gebruiker niet meer de verbannen kan hij/zij opnieuw toetreden tot het gesprek.</string>
-    <string name="space_participants_ban_prompt_msg">Door deze gebruiker te verbannen zal hij/zij verwijderd worden uit deze space en voorkomen dat hij/zij opnieuw toetreedt.</string>
+    <string name="space_participants_unban_prompt_msg">Door deze persoon niet meer de verbannen kan hij/zij opnieuw toetreden tot de space.</string>
+    <string name="room_participants_unban_prompt_msg">Door deze persoon niet meer de verbannen kan hij/zij opnieuw toetreden tot het gesprek.</string>
+    <string name="space_participants_ban_prompt_msg">Door deze persoon te verbannen zal hij/zij verwijderd worden uit deze space en voorkomen dat hij/zij opnieuw toetreedt.</string>
     <string name="room_participants_ban_reason">Reden voor verbanning</string>
-    <string name="space_participants_remove_prompt_msg">door deze gebruiker de verwijderen zal hij/zij niet meer in deze space zitten.
+    <string name="space_participants_remove_prompt_msg">Door deze persoon de verwijderen zal hij/zij niet meer in deze space zitten.
 \n
 \nOm te voorkomen dat hij/zij opnieuw toetreedt, kunt u hem/haar ook verbannen.</string>
-    <string name="room_participants_remove_prompt_msg">door deze gebruiker te verwijderen zal hij/zij niet meer in dit gesprek zitten.
+    <string name="room_participants_remove_prompt_msg">Door deze persoon te verwijderen zal hij/zij niet meer in dit gesprek zitten.
 \n
 \nOm te voorkomen dat hij/zij opnieuw toetreedt, kun je hem/haar ook verbannen.</string>
     <string name="room_participants_remove_reason">Reden voor verwijdering</string>
-    <string name="room_participants_action_cancel_invite_prompt_msg">Weet u zeker dat u uitnodiging voor deze gebruiker wilt annuleren\?</string>
-    <string name="room_participants_action_unignore_prompt_msg">Het niet meer negeren van deze gebruiker zal al zijn/haar berichten opnieuw doen weergeven.</string>
-    <string name="room_participants_action_ignore_prompt_msg">Door deze gebruiker te negeren worden zijn/haar berichten verwijderd uit gesprekken die jullie delen.
+    <string name="room_participants_action_cancel_invite_prompt_msg">Weet u zeker dat u uitnodiging voor deze persoon wilt annuleren\?</string>
+    <string name="room_participants_action_unignore_prompt_msg">Als u deze persoon niet negeert, worden alle berichten van deze persoon opnieuw weergegeven.
+\n
+\nHoud er rekening mee dat deze actie de app opnieuw zal starten en dat dit enige tijd kan duren.</string>
+    <string name="room_participants_action_ignore_prompt_msg">Door deze persoon te negeren worden zijn/haar berichten verwijderd uit gesprekken die jullie delen.
 \n
 \nU kunt deze actie op elk moment ongedaan maken in de algemene instellingen.</string>
-    <string name="room_participants_power_level_demote_warning_prompt">U kunt deze wijziging niet ongedaan maken omdat uzelf degradeert, als u de laatste gebruiker met rechten bent in het gesprek zal het onmogelijk zijn om opnieuw rechten te krijgen.</string>
+    <string name="room_participants_power_level_demote_warning_prompt">U kunt deze wijziging niet ongedaan maken omdat uzelf degradeert, als u de laatste persoon met rechten bent in het gesprek zal het onmogelijk zijn om opnieuw rechten te krijgen.</string>
     <string name="room_participants_leave_private_warning">Dit gesprek is niet publiek. U kunt niet opnieuw toetreden zonder uitnodiging.</string>
     <string name="permissions_denied_add_contact">Toegang verlenen tot uw contactpersonen.</string>
     <string name="permissions_denied_qr_code">Om de QR-code te scannen moet u toegang verlenen tot de camera.</string>
     <string name="call_remove_jitsi_widget_progress">Oproep beëindigen…</string>
     <string name="call_ended_invite_timeout_title">Geen antwoord</string>
-    <string name="call_ended_user_busy_description">De gebruiker die u heeft gebeld is bezig.</string>
-    <string name="call_ended_user_busy_title">Gebruiker bezig</string>
+    <string name="call_ended_user_busy_description">De persoon die u heeft gebeld is bezet.</string>
+    <string name="call_ended_user_busy_title">Persoon bezet</string>
     <string name="call_held_by_you">U heeft de oproep in de wacht gezet</string>
     <string name="call_held_by_user">%s heeft de oproep in de wacht gezet</string>
     <string name="audio_call_with_participant">Bellen met %s</string>
@@ -1313,10 +1282,10 @@
     <string name="call_format_turn_hd_off">HD uitschakelen</string>
     <string name="call_select_sound_device">Geluidsapparaat Selecteren</string>
     <string name="call_failed_no_connection_description">Kan geen realtime verbinding tot stand brengen.
-\nVraag de beheerder van uw thuisserver om een TURN-server te configureren om gesprekken betrouwbaar te laten werken.</string>
+\nVraag de beheerder van uw server om een TURN-server te configureren om gesprekken betrouwbaar te laten werken.</string>
     <string name="call_failed_no_connection">${app_name} Oproep Mislukt</string>
-    <string name="hs_client_url">Thuisserver API URL</string>
-    <string name="send_bug_report_include_key_share_history">Sleutel deelverzoekgeschiedenis verzenden</string>
+    <string name="hs_client_url">Server API URL</string>
+    <string name="send_bug_report_include_key_share_history">Sleutel deelverzoekgeschiedenis versturen</string>
     <string name="settings_room_directory_show_all_rooms_summary">Alle gesprekken in de lijst tonen, waaronder gesprekken met expliciete inhoud.</string>
     <string name="settings_room_directory_show_all_rooms">Gesprekken tonen met expliciete inhoud</string>
     <string name="settings_category_room_directory">Gesprekslijst</string>
@@ -1345,11 +1314,11 @@
     <string name="login_reset_password_notice">Er wordt een verificatie-e-mail naar uw inbox gestuurd om het instellen van uw nieuwe wachtwoord te bevestigen.</string>
     <string name="login_reset_password_on">Wachtwoord opnieuw instellen op %1$s</string>
     <string name="login_login_with_email_error">Dit e-mailadres is niet gekoppeld aan een account.</string>
-    <string name="login_registration_not_supported">De applicatie kan geen account aanmaken op deze thuisserver.
+    <string name="login_registration_not_supported">De applicatie kan geen account aanmaken op deze server.
 \n
 \nWilt u zich aanmelden met een webclient\?</string>
     <string name="login_registration_disabled">Sorry, deze server accepteert geen nieuwe accounts.</string>
-    <string name="login_mode_not_supported">De applicatie kan niet inloggen op deze thuisserver. De thuisserver ondersteunt de volgende aanmeldingstype(s): %1$s.
+    <string name="login_mode_not_supported">De applicatie kan niet inloggen op deze server. De thuisserver ondersteunt de volgende aanmeldingstype(s): %1$s.
 \n
 \nWil je inloggen met een webclient\?</string>
     <string name="login_sso_error_message">Er is een fout opgetreden bij het laden van de pagina: %1$s (%2$d)</string>
@@ -1381,7 +1350,7 @@
     <string name="room_join_rules_invite_by_you">Je hebt de kamer alleen op uitnodiging gemaakt.</string>
     <string name="room_join_rules_invite">%1$s heeft de kamer alleen voor uitnodigingen ingesteld.</string>
     <string name="room_join_rules_public_by_you">U heeft de kamer openbaar gemaakt voor iedereen die de link kent.</string>
-    <string name="no_ignored_users">U negeert geen enkele gebruiker</string>
+    <string name="no_ignored_users">U negeert geen enkele persoon</string>
     <string name="room_join_rules_public">%1$s heeft de kamer openbaar gemaakt voor iedereen die de link kent.</string>
     <string name="help_long_click_on_room_for_more_options">Klik lang op een kamer om meer opties te zien</string>
     <string name="reaction_search_type_hint">Schrijf trefwoorden om een reactie te vinden.</string>
@@ -1395,18 +1364,17 @@
     <string name="room_list_quick_actions_favorite_remove">Verwijder van favorieten</string>
     <string name="room_list_quick_actions_favorite_add">Toevoegen aan favorieten</string>
     <string name="room_list_quick_actions_notifications_all_noisy">Alle berichten (luidruchtig)</string>
-
     <string name="content_reported_as_inappropriate_content">Deze inhoud is als ongepast gerapporteerd.
 \n
-\nAls u geen inhoud van deze gebruiker meer wilt zien, kunt u deze negeren om hun berichten te verbergen.</string>
+\nAls u geen inhoud van deze persoon meer wilt zien, kunt u deze negeren om hun berichten te verbergen.</string>
     <string name="content_reported_as_inappropriate_title">Gemeld als ongepast</string>
     <string name="content_reported_as_spam_content">Deze inhoud is gerapporteerd als spam.
 \n
-\nAls u geen inhoud van deze gebruiker meer wilt zien, kunt u deze negeren om hun berichten te verbergen.</string>
+\nAls u geen inhoud van deze persoon meer wilt zien, kunt u deze negeren om hun berichten te verbergen.</string>
     <string name="content_reported_as_spam_title">Gerapporteerd als spam</string>
     <string name="content_reported_content">Deze inhoud is gemeld.
 \n
-\nAls u geen inhoud van deze gebruiker meer wilt zien, kunt u deze negeren om hun berichten te verbergen.</string>
+\nAls u geen inhoud van deze persoon meer wilt zien, kunt u deze negeren om hun berichten te verbergen.</string>
     <string name="report_content_custom_hint">Reden voor het rapporteren van deze inhoud</string>
     <string name="report_content_custom_title">Deze inhoud rapporteren</string>
     <string name="uploads_files_no_result">Er zijn geen bestanden in deze kamer</string>
@@ -1420,8 +1388,8 @@
     <string name="error_attachment">Er is een fout opgetreden bij het ophalen van de bijlage.</string>
     <string name="error_file_too_big_simple">Het bestand is te groot om te uploaden.</string>
     <plurals name="fallback_users_read">
-        <item quantity="one">%d gebruiker gelezen</item>
-        <item quantity="other">%d gebruikers gelezen</item>
+        <item quantity="one">%d persoon gelezen</item>
+        <item quantity="other">%d personen gelezen</item>
     </plurals>
     <string name="two_users_read">%1$s en %2$s gelezen</string>
     <string name="three_users_read">%1$s, %2$s en %3$s gelezen</string>
@@ -1449,16 +1417,14 @@
     <string name="settings_discovery_please_enter_server">Voer de URL van de identiteitsserver in</string>
     <string name="settings_discovery_bad_identity_server">Kan geen verbinding maken met identiteitsserver</string>
     <string name="settings_discovery_enter_identity_server">Voer een identiteitsserver URL in</string>
-    <string name="identity_server_consent_dialog_content_question">Gaat u akkoord met het verzenden van deze informatie\?</string>
+    <string name="identity_server_consent_dialog_content_question">Gaat u akkoord met het versturen van deze informatie\?</string>
     <string name="identity_server_consent_dialog_content_3">Om bestaande contacten te ontdekken, moet u contactgegevens (e-mailadressen en telefoonnummers) naar uw identiteitsserver sturen. We hashen uw gegevens voordat ze worden verzonden vanwege privacy.</string>
-
-
     <string name="identity_server_consent_dialog_title_2">Stuur e-mailadressen en telefoonnummers naar %s</string>
     <string name="settings_discovery_consent_action_give_consent">Toestemming geven</string>
     <string name="settings_discovery_consent_action_revoke">Mijn toestemming intrekken</string>
-    <string name="legals_home_server_title">Uw thuisserver-beleid</string>
-    <string name="login_error_homeserver_from_url_not_found">Kan geen thuisserver bereiken op de URL %s. Controleer uw link of kies handmatig een thuisserver.</string>
-    <string name="settings_discovery_consent_notice_off_2">Uw contacten zijn privé. Om gebruikers van uw contacten te ontdekken, hebben we uw toestemming nodig om contactgegevens naar uw identiteitsserver te sturen.</string>
+    <string name="legals_home_server_title">Uw server-beleid</string>
+    <string name="login_error_homeserver_from_url_not_found">Kan geen server bereiken op de URL %s. Controleer uw link of kies handmatig een server.</string>
+    <string name="settings_discovery_consent_notice_off_2">Uw contacten zijn privé. Om personen van uw contacten te ontdekken, hebben we uw toestemming nodig om contactgegevens naar uw identiteitsserver te sturen.</string>
     <string name="settings_discovery_confirm_mail_not_clicked">We hebben u een bevestigingsmail gestuurd naar %s, controleer eerst uw e-mail en klik op de bevestigingslink</string>
     <string name="settings_discovery_confirm_mail">We hebben u een bevestigingsmail gestuurd naar %s, controleer uw e-mail en klik op de bevestigingslink</string>
     <string name="settings_discovery_no_mails">Ontdekkingsopties verschijnen zodra u een e-mail heeft toegevoegd.</string>
@@ -1471,14 +1437,14 @@
     <string name="command_description_nick_for_room">Verander uw schermnaam alleen in de huidige kamer</string>
     <string name="other_spaces_or_rooms_you_might_not_know">Andere spaces of kamers die u misschien niet kent</string>
     <string name="space_you_know_that_contains_this_room">Space die u kent die deze kamer bevat</string>
-    <string name="room_alias_local_address_subtitle">Stel adressen in voor deze kamer zodat gebruikers deze kamer kunnen vinden via uw thuisserver (%1$s)</string>
+    <string name="room_alias_local_address_subtitle">Stel adressen in voor deze kamer zodat personen deze kamer kunnen vinden via uw server (%1$s)</string>
     <string name="analytics_opt_in_list_item_3">U kunt dit op elk moment uitschakelen in de instellingen</string>
     <string name="settings_mentions_and_keywords_encryption_notice">U krijgt geen meldingen voor vermeldingen en trefwoorden in versleutelde kamers op uw mobiel.</string>
     <string name="error_threepid_auth_failed">Zorg ervoor dat u op de link heeft geklikt in de e-mail die we u hebben gestuurd.</string>
-    <string name="settings_discovery_consent_notice_on">U hebt uw toestemming gegeven om e-mails en telefoonnummers naar deze identiteitsserver te sturen om andere gebruikers van uw contacten te ontdekken.</string>
-    <string name="settings_discovery_consent_title">E-mails en telefoonnummers verzenden</string>
+    <string name="settings_discovery_consent_notice_on">U hebt uw toestemming gegeven om e-mails en telefoonnummers naar deze identiteitsserver te sturen om andere personen van uw contacten te ontdekken.</string>
+    <string name="settings_discovery_consent_title">E-mailadressen en telefoonnummers versturen</string>
     <string name="settings_discovery_msisdn_title">Vindbare telefoonnummers</string>
-    <string name="settings_discovery_disconnect_identity_server_info">Als u de verbinding met uw identiteitsserver verbreekt, betekent dit dat u niet door andere gebruikers kan worden gevonden en dat u anderen niet per e-mail of telefoon kunt uitnodigen.</string>
+    <string name="settings_discovery_disconnect_identity_server_info">Als u de verbinding met uw identiteitsserver verbreekt, betekent dit dat u niet door andere personen kan worden gevonden en dat u anderen niet per e-mail of telefoon kunt uitnodigen.</string>
     <string name="settings_discovery_no_msisdn">Ontdekkingsopties verschijnen zodra u een telefoonnummer heeft toegevoegd.</string>
     <string name="settings_discovery_emails_title">Vindbare e-mailadressen</string>
     <string name="settings_discovery_identity_server_info_none">U gebruikt momenteel geen identiteitsserver. Om te ontdekken en vindbaar te zijn door bestaande contacten die u kent, configureert u er een hieronder.</string>
@@ -1493,7 +1459,7 @@
     <string name="terms_description_for_identity_server">Vindbaar zijn voor anderen</string>
     <string name="terms_of_service">Servicevoorwaarden</string>
     <string name="message_view_edit_history">Bekijken Bewerken Geschiedenis</string>
-    <string name="direct_room_user_list_known_title">Bekende gebruikers</string>
+    <string name="direct_room_user_list_known_title">Bekende personen</string>
     <string name="qr_code">QR-code</string>
     <string name="add_by_qr_code">Toevoegen via QR-code</string>
     <string name="link_copied_to_clipboard">Link gekopieerd naar klembord</string>
@@ -1503,22 +1469,22 @@
     <string name="user_directory_search_hint_2">Zoeken op naam, ID of e-mail</string>
     <string name="room_directory_search_hint">Naam of ID (#voorbeeld:matrix.org)</string>
     <string name="room_filtering_footer_open_room_directory">Bekijk de kamer directory</string>
-    <string name="room_filtering_footer_create_new_direct_message">Een nieuw privébericht verzenden</string>
+    <string name="room_filtering_footer_create_new_direct_message">Een nieuw privébericht versturen</string>
     <string name="room_filtering_footer_create_new_room">Nieuwe kamer aanmaken</string>
     <string name="room_filtering_footer_title">Kunt u niet vinden wat u zoekt\?</string>
     <string name="no_message_edits_found">Geen bewerkingen gevonden</string>
     <string name="downloaded_file">Bestand %1$s is gedownload!</string>
     <string name="send_file_step_compressing_video">Video comprimeren %d%%</string>
     <string name="send_file_step_compressing_image">Afbeelding comprimeren…</string>
-    <string name="send_file_step_sending_file">Bestand verzenden (%1$s / %2$s)</string>
-    <string name="send_file_step_sending_thumbnail">Miniatuur verzenden (%1$s / %2$s)</string>
+    <string name="send_file_step_sending_file">Bestand versturen (%1$s / %2$s)</string>
+    <string name="send_file_step_sending_thumbnail">Miniatuur versturen (%1$s / %2$s)</string>
     <string name="settings_labs_show_complete_history_in_encrypted_room">Toon volledige geschiedenis in versleutelde kamers</string>
     <string name="settings_labs_show_hidden_events_in_timeline">Toon verborgen gebeurtenissen op de tijdlijn</string>
     <string name="give_feedback">Geef feedback</string>
     <string name="feedback_failed">De feedback kan niet worden verzonden (%s)</string>
     <string name="feedback_sent">Bedankt, uw feedback is succesvol verzonden</string>
     <string name="you_may_contact_me">U kunt contact met mij opnemen als u vervolgvragen heeft</string>
-    <string name="send_feedback_space_info">U gebruikt een bètaversie van spaces. Uw feedback zal helpen bij het informeren van de volgende versies. Uw platform en gebruikersnaam worden genoteerd om ons te helpen uw feedback zoveel mogelijk te gebruiken.</string>
+    <string name="send_feedback_space_info">U gebruikt een bètaversie van spaces. Uw feedback zal helpen bij het informeren van de volgende versies. Uw platform en inlognaam worden genoteerd om ons te helpen uw feedback zoveel mogelijk te gebruiken.</string>
     <string name="send_feedback_space_title">Spaces feedback</string>
     <string name="send_suggestion_failed">De suggestie kan niet worden verzonden (%s)</string>
     <string name="send_suggestion_sent">Bedankt, de suggestie is succesvol verzonden</string>
@@ -1551,11 +1517,11 @@
     <string name="secure_backup_setup">Beveiligde back-up instellen</string>
     <string name="secure_backup_banner_setup_line2">Beveiliging tegen verlies van toegang tot versleutelde berichten en gegevens</string>
     <string name="recovery_key_export_saved">De herstelsleutel is opgeslagen.</string>
-    <string name="command_description_whois">Toont informatie over een gebruiker</string>
+    <string name="command_description_whois">Toont informatie over een persoon</string>
     <string name="command_description_room_avatar">Verandert de avatar van de huidige kamer</string>
     <string name="command_description_room_name">Stelt de kamernaam in</string>
-    <string name="command_description_unignore_user">Stopt met het negeren van een gebruiker, toon hun berichten in de toekomst</string>
-    <string name="command_description_ignore_user">Negeer een gebruiker en verberg hun berichten voor jou</string>
+    <string name="command_description_unignore_user">Stopt met het negeren van een persoon, toon hun berichten in de toekomst</string>
+    <string name="command_description_ignore_user">Negeer een persoon en verberg hun berichten voor jou</string>
     <string name="room_no_active_widgets">Geen actieve widgets</string>
     <string name="jitsi_leave_conf_to_join_another_one_content">De huidige conferentie verlaten en naar de andere overschakelen\?</string>
     <string name="error_jitsi_join_conf">Sorry, er is een fout opgetreden bij het deelnemen aan de conferentie</string>
@@ -1574,8 +1540,8 @@
     <string name="encryption_exported_successfully">Sleutels succesvol geëxporteerd</string>
     <string name="room_settings_room_version_title">Kamer versie</string>
     <plurals name="room_settings_banned_users_count">
-        <item quantity="one">%d verbannen gebruiker</item>
-        <item quantity="other">%d verbannen gebruikers</item>
+        <item quantity="one">%d verbannen persoon</item>
+        <item quantity="other">%d verbannen personen</item>
     </plurals>
     <string name="decide_who_can_find_and_join">Bepaal wie deze kamer kan vinden en er lid van kan worden.</string>
     <string name="tap_to_edit_spaces">Tik om spaces te bewerken</string>
@@ -1654,7 +1620,7 @@
     <string name="settings_group_messages">Groepsberichten</string>
     <string name="settings_encrypted_direct_messages">Versleutelde directe berichten</string>
     <string name="settings_messages_direct_messages">Directe berichten</string>
-    <string name="settings_messages_containing_username">Mijn gebruikersnaam</string>
+    <string name="settings_messages_containing_username">Mijn inlognaam</string>
     <string name="settings_messages_containing_display_name">Mijn weergavenaam</string>
     <string name="settings_messages_at_room">Berichten bevatten @room</string>
     <string name="settings_when_rooms_are_upgraded">Wanneer kamers worden opgewaardeerd</string>
@@ -1681,7 +1647,7 @@
     <string name="shortcut_disabled_reason_sign_out">De sessie is afgemeld!</string>
     <string name="shortcut_disabled_reason_room_left">De kamer is verlaten!</string>
     <string name="room_settings_mention_and_keyword_only">Alleen vermeldingen en trefwoorden</string>
-    <string name="search_banned_user_hint">Filter verbannen gebruikers</string>
+    <string name="search_banned_user_hint">Filter verbannen personen</string>
     <string name="room_permissions_change_topic">Verander onderwerp</string>
     <string name="room_permissions_upgrade_the_space">Space upgraden</string>
     <string name="room_permissions_upgrade_the_room">Kamer upgraden</string>
@@ -1699,10 +1665,10 @@
     <string name="room_permissions_modify_widgets">Widgets wijzigen</string>
     <string name="room_permissions_notify_everyone">Iedereen informeren</string>
     <string name="room_permissions_remove_messages_sent_by_others">Berichten verwijderen die door anderen zijn verzonden</string>
-    <string name="room_permissions_ban_users">Gebruikers verbannen</string>
-    <string name="room_permissions_remove_users">Kick gebruikers</string>
+    <string name="room_permissions_ban_users">Personen verbannen</string>
+    <string name="room_permissions_remove_users">Kick personen</string>
     <string name="room_permissions_change_settings">Instellingen veranderen</string>
-    <string name="room_permissions_invite_users">Gebruikers uitnodigen</string>
+    <string name="room_permissions_invite_users">Personen uitnodigen</string>
     <string name="room_permissions_send_messages">Berichten sturen</string>
     <string name="room_permissions_default_role">Standaardrol</string>
     <string name="space_permissions_notice_read_only">U bent niet gemachtigd om de rollen bij te werken die nodig zijn om verschillende delen van deze space te wijzigen</string>
@@ -1711,7 +1677,7 @@
     <string name="room_permissions_notice">Selecteer de rollen die nodig zijn om verschillende delen van de kamer te veranderen</string>
     <string name="space_settings_permissions_subtitle">Bekijk en update de rollen die nodig zijn om verschillende delen van de kamer te veranderen.</string>
     <string name="room_settings_permissions_subtitle">Bekijk en update de rollen die nodig zijn om verschillende delen van de kamer te veranderen.</string>
-    <string name="login_error_homeserver_from_url_not_found_enter_manual">Kies thuisserver</string>
+    <string name="login_error_homeserver_from_url_not_found_enter_manual">Kies server</string>
     <string name="action_not_now">Niet nu</string>
     <string name="action_enable">Inschakelen</string>
     <string name="notification_listening_for_notifications">Luisteren naar notificaties</string>
@@ -1723,12 +1689,12 @@
     <string name="dev_tools_error_no_content">Geen content</string>
     <string name="dev_tools_form_hint_event_content">Event inhoud</string>
     <string name="dev_tools_form_hint_state_key">Statussleutel</string>
-    <string name="dev_tools_send_custom_state_event">Aangepaste statusgebeurtenis verzenden</string>
+    <string name="dev_tools_send_custom_state_event">Aangepaste statusgebeurtenis versturen</string>
     <string name="dev_tools_edit_content">Inhoud bewerken</string>
     <string name="dev_tools_state_event">Staat gebeurtenissen</string>
-    <string name="dev_tools_send_state_event">Statusgebeurtenis verzenden</string>
-    <string name="dev_tools_send_custom_event">Aangepaste gebeurtenis verzenden</string>
-    <string name="dev_tools_explore_room_state">Kamerstatus verkennen</string>
+    <string name="dev_tools_send_state_event">Statusgebeurtenis versturen</string>
+    <string name="dev_tools_send_custom_event">Aangepaste gebeurtenis versturen</string>
+    <string name="dev_tools_explore_room_state">Kamer status ontdekken</string>
     <string name="dev_tools_menu_name">Ontwikkel tools</string>
     <string name="a11y_presence_unavailable">Niet beschikbaar</string>
     <string name="a11y_presence_offline">Offline</string>
@@ -1765,8 +1731,6 @@
         <item quantity="one">Actieve oproep ·</item>
         <item quantity="other">%1$d actieve gesprekken ·</item>
     </plurals>
-
-
     <string name="call_only_active">Actieve oproep (%1$s)</string>
     <string name="call_dial_pad_lookup_error">Er is een fout opgetreden bij het opzoeken van het telefoonnummer</string>
     <string name="call_dial_pad_title">Toetsenblok</string>
@@ -1827,7 +1791,7 @@
     </plurals>
     <string name="alert_push_are_disabled_description">Controleer uw instellingen om pushmeldingen in te schakelen</string>
     <string name="alert_push_are_disabled_title">Pushmeldingen zijn uitgeschakeld</string>
-    <string name="failed_to_unban">Kan gebruiker verbanning niet opheffen</string>
+    <string name="failed_to_unban">Kan persoon verbanning niet opheffen</string>
     <string name="member_banned_by">Verbannen door %1$s</string>
     <string name="three_pid_revoke_invite_dialog_content">Uitnodiging voor %1$s intrekken\?</string>
     <string name="phone_book_perform_lookup">Zoeken naar contacten op Matrix</string>
@@ -1863,14 +1827,14 @@
     <string name="a11y_mute_microphone">De microfoon dempen</string>
     <string name="identity_server_set_alternative_notice_no_default">Voer de URL van een identiteitsserver in</string>
     <string name="identity_server_set_alternative_notice">U kunt ook een andere identiteitsserver URL invoeren</string>
-    <string name="identity_server_set_default_notice">Uw thuisserver (%1$s) stelt voor om %2$s te gebruiken voor uw identiteitsserver</string>
-    <string name="identity_server_user_consent_not_provided">De toestemming van de gebruiker is niet gegeven.</string>
+    <string name="identity_server_set_default_notice">Uw server (%1$s) stelt voor om %2$s te gebruiken voor uw identiteitsserver</string>
+    <string name="identity_server_user_consent_not_provided">De toestemming van de persoon is niet gegeven.</string>
     <string name="identity_server_error_no_current_binding_error">Er is geen huidige associatie met dit id.</string>
     <string name="identity_server_error_binding_error">De associatie heeft gefaald.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Voor uw privacy ondersteunt ${app_name} alleen het verzenden van gehashte e-mailadressen en telefoonnummers van gebruikers.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Voor uw privacy ondersteunt ${app_name} alleen het versturen van gehashte e-mailadressen en telefoonnummers van personen.</string>
     <string name="identity_server_error_terms_not_signed">Accepteer eerst de voorwaarden van de identiteitsserver in de instellingen.</string>
     <string name="identity_server_error_no_identity_server_configured">Configureer eerst een identiteitsserver.</string>
-    <string name="identity_server_error_outdated_home_server">Deze operatie is niet mogelijk. De thuisserver is verouderd.</string>
+    <string name="identity_server_error_outdated_home_server">Deze operatie is niet mogelijk. De server is verouderd.</string>
     <string name="identity_server_error_outdated_identity_server">Deze identiteitsserver is verouderd. ${app_name} ondersteunt alleen API V2.</string>
     <string name="disconnect_identity_server_dialog_content">Verbinding met identiteitsserver %s verbreken\?</string>
     <string name="open_terms_of">Open voorwaarden van %s</string>
@@ -1880,7 +1844,7 @@
     <string name="user_code_my_code">Mijn code</string>
     <string name="user_code_share">Deel mijn code</string>
     <string name="user_code_scan">Scan een QR-code</string>
-    <string name="invite_users_to_room_failure">We kunnen geen gebruikers uitnodigen. Controleer de gebruikers die u wilt uitnodigen en probeer het opnieuw.</string>
+    <string name="invite_users_to_room_failure">We kunnen geen personen uitnodigen. Controleer de personen die u wilt uitnodigen en probeer het opnieuw.</string>
     <plurals name="invitations_sent_to_one_and_more_users">
         <item quantity="one">Uitnodigingen verzonden naar %1$s en nog één</item>
         <item quantity="other">Uitnodigingen verzonden naar %1$s en %2$d meer</item>
@@ -1892,13 +1856,13 @@
     <string name="invite_friends_text">Hé, praat met me op ${app_name}: %s</string>
     <string name="invite_friends">Nodig vrienden uit</string>
     <string name="add_people">Mensen toevoegen</string>
-    <string name="create_room_dm_failure">We kunnen je DM niet maken. Controleer de gebruikers die u wilt uitnodigen en probeer het opnieuw.</string>
+    <string name="create_room_dm_failure">We kunnen je DM niet maken. Controleer de personen die u wilt uitnodigen en probeer het opnieuw.</string>
     <string name="external_link_confirmation_message">De link %1$s brengt u naar een andere site: %2$s.
 \n
 \nWeet u zeker dat u door wilt gaan\?</string>
     <string name="external_link_confirmation_title">Dubbelcheck deze link</string>
     <string name="error_empty_field_choose_password">Kies een wachtwoord.</string>
-    <string name="error_empty_field_choose_user_name">Kies een gebruikersnaam.</string>
+    <string name="error_empty_field_choose_user_name">Kies een inlognaam.</string>
     <string name="failed_to_initialize_cross_signing">Kan kruislingsondertekenen niet instellen</string>
     <string name="confirm_your_identity_quad_s">Bevestig uw identiteit door deze login te verifiëren en deze toegang te verlenen tot versleutelde berichten.</string>
     <string name="confirm_your_identity">Bevestig uw identiteit door deze login van een van uw andere sessies te verifiëren en toegang te verlenen tot versleutelde berichten.</string>
@@ -1916,7 +1880,7 @@
         <item quantity="one">Laat het apparaat zien waarmee u nu kunt verifiëren</item>
         <item quantity="other">%d apparaten weergeven waarmee u nu kunt verifiëren</item>
     </plurals>
-    <string name="secure_backup_reset_no_history">U start opnieuw op zonder geschiedenis, geen berichten, vertrouwde apparaten of vertrouwde gebruikers</string>
+    <string name="secure_backup_reset_no_history">U start opnieuw op zonder geschiedenis, geen berichten, vertrouwde apparaten of vertrouwde personen</string>
     <string name="secure_backup_reset_if_you_reset_all">Als je alles reset</string>
     <string name="secure_backup_reset_all_no_other_devices">Doe dit alleen als u geen ander apparaat heeft waarmee u dit apparaat kunt verifiëren.</string>
     <string name="bad_passphrase_key_reset_all_action">Alle herstelopties vergeten of verloren\? Alles resetten</string>
@@ -1954,7 +1918,7 @@
     <string name="security_prompt_text">Verifieer uzelf en anderen om uw chats veilig te houden</string>
     <string name="upgrade_security">Encryptie upgrade beschikbaar</string>
     <string name="auth_invalid_login_deactivated_account">Dit account is gedeactiveerd.</string>
-    <string name="auth_invalid_login_param_space_in_password">Onjuiste gebruikersnaam en/of wachtwoord. Het ingevoerde wachtwoord begint of eindigt met spaties, controleer dit alstublieft.</string>
+    <string name="auth_invalid_login_param_space_in_password">Onjuiste inlognaam en/of wachtwoord. Het ingevoerde wachtwoord begint of eindigt met spaties, controleer dit alstublieft.</string>
     <string name="command_description_plain">Verzendt een bericht als platte tekst, zonder het als markdown te interpreteren</string>
     <string name="error_failed_to_import_keys">Kan sleutels niet importeren</string>
     <string name="qr_code_scanned_verif_waiting">Wachten op %s…</string>
@@ -1970,11 +1934,10 @@
     <string name="encryption_unknown_algorithm_tile_description">De versleuteling die door deze kamer wordt gebruikt, wordt niet ondersteund</string>
     <string name="encryption_not_enabled">Versleuteling niet ingeschakeld</string>
     <string name="direct_room_encryption_enabled_tile_description">Berichten in deze kamer zijn end-to-end-versleuteld.</string>
-    <string name="encryption_enabled_tile_description">Berichten in deze kamer zijn end-to-end-versleuteld. Lees meer en verifieer gebruikers in hun profiel.</string>
+    <string name="encryption_enabled_tile_description">Berichten in deze kamer zijn eind-tot-eind-versleuteld. Lees meer en verifieer persoon in hun profiel.</string>
     <string name="bootstrap_cancel_text">Als u nu annuleert, kunt u versleutelde berichten en gegevens kwijtraken als u de toegang tot uw aanmeldingen verliest.
 \n
 \nU kunt ook Veilige back-up instellen en uw sleutels beheren in Instellingen.</string>
-
     <string name="bootstrap_crosssigning_save_cloud">Kopieer het naar uw persoonlijke cloudopslag</string>
     <string name="bootstrap_crosssigning_save_usb">Bewaar het op een USB-stick of back-upstation</string>
     <string name="bootstrap_crosssigning_print_it">Print het uit en bewaar het ergens veilig</string>
@@ -1983,7 +1946,7 @@
 \nHoud ze veilig! U heeft ze nodig om versleutelde berichten te ontgrendelen en informatie te beveiligen als u al uw actieve sessies verliest.</string>
     <string name="bootstrap_crosssigning_progress_key_backup">Sleutelback-up instellen</string>
     <string name="bootstrap_crosssigning_progress_save_ssk">Zelfondertekenende sleutel synchroniseren</string>
-    <string name="bootstrap_crosssigning_progress_save_usk">Gebruikerssleutel synchroniseren</string>
+    <string name="bootstrap_crosssigning_progress_save_usk">Persoonssleutel synchroniseren</string>
     <string name="bootstrap_crosssigning_progress_save_msk">Hoofdsleutel synchroniseren</string>
     <string name="bootstrap_crosssigning_progress_default_key">SSSS standaardsleutel definiëren</string>
     <string name="bootstrap_crosssigning_progress_pbkdf2">Beveiligde sleutel genereren op basis van wachtwoordzin</string>
@@ -1998,14 +1961,14 @@
     <string name="verify_not_me_self_verification">Een van de volgende zaken kan worden aangetast:
 \n
 \n- Uw wachtwoord
-\n- Uw thuisserver
+\n- Uw server
 \n- Dit apparaat, of het andere apparaat
 \n- De internetverbinding die elk apparaat gebruikt
 \n
 \nWe raden u aan uw wachtwoord en herstelsleutel onmiddellijk in Instellingen te wijzigen.</string>
-    <string name="verify_cancel_other">U verifieert %1$s (%2$s) niet als u nu annuleert. Begin opnieuw in hun gebruikersprofiel.</string>
-    <string name="verify_cancel_self_verification_from_untrusted">Als u annuleert, kunt u geen versleutelde berichten op dit apparaat lezen en zullen andere gebruikers het niet vertrouwen</string>
-    <string name="verify_cancel_self_verification_from_trusted">Als u annuleert, kunt u geen versleutelde berichten lezen op je nieuwe apparaat en zullen andere gebruikers het niet vertrouwen</string>
+    <string name="verify_cancel_other">U verifieert %1$s (%2$s) niet als u nu annuleert. Begin opnieuw in hun profiel.</string>
+    <string name="verify_cancel_self_verification_from_untrusted">Als u annuleert, kunt u geen versleutelde berichten op dit apparaat lezen en zullen andere personen het niet vertrouwen</string>
+    <string name="verify_cancel_self_verification_from_trusted">Als u annuleert, kunt u geen versleutelde berichten lezen op je nieuwe apparaat en zullen andere personen het niet vertrouwen</string>
     <string name="verify_new_session_compromized">Uw account is mogelijk gecompromitteerd</string>
     <string name="verify_new_session_was_not_me">Dit was ik niet</string>
     <string name="verify_new_session_notice">Gebruik deze sessie om uw nieuwe te verifiëren en deze toegang te verlenen tot versleutelde berichten.</string>
@@ -2015,11 +1978,11 @@
     <string name="login_default_session_public_name">${app_name} Android</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">Sleutels zijn al up-to-date!</string>
     <string name="event_redacted_by_admin_reason_with_reason">Gebeurtenis gemodereerd door kamer beheerder, reden: %1$s</string>
-    <string name="event_redacted_by_user_reason_with_reason">Gebeurtenis verwijderd door gebruiker, reden: %1$s</string>
+    <string name="event_redacted_by_user_reason_with_reason">Gebeurtenis verwijderd door persoon, reden: %1$s</string>
     <string name="delete_event_dialog_reason_hint">Reden voor redigeren</string>
     <string name="delete_event_dialog_reason_checkbox">Geef een reden op</string>
     <string name="delete_event_dialog_content">Weet u zeker dat u deze gebeurtenis wilt verwijderen (wissen)\? Houd er rekening mee dat als u een kamer naam of onderwerpwijziging verwijdert, de wijziging ongedaan kan worden gemaakt.</string>
-    <string name="send_images_and_video_with_original_size">Media verzenden in het originele formaat</string>
+    <string name="send_images_and_video_with_original_size">Media versturen in het originele formaat</string>
     <plurals name="send_videos_with_original_size">
         <item quantity="one">Stuur video in het originele formaat</item>
         <item quantity="other">Stuur video\'s in het originele formaat</item>
@@ -2038,7 +2001,7 @@
     <string name="no_connectivity_to_the_server_indicator_airplane">Vliegtuigmodus is ingeschakeld</string>
     <string name="no_connectivity_to_the_server_indicator">Verbinding met de server is verbroken</string>
     <string name="qr_code_scanned_by_other_notice">Bijna daar! Toont %s een vinkje\?</string>
-    <string name="verification_profile_device_untrust_info">Totdat deze gebruiker deze sessie vertrouwt, worden berichten die van en naar de sessie worden verzonden, gelabeld met waarschuwingen. U kunt het ook handmatig verifiëren.</string>
+    <string name="verification_profile_device_untrust_info">Totdat deze persoon deze sessie vertrouwt, worden berichten die van en naar de sessie worden verzonden, gelabeld met waarschuwingen. U kunt het ook handmatig verifiëren.</string>
     <string name="verification_profile_device_new_signing">%1$s (%2$s) aangemeld met een nieuwe sessie:</string>
     <string name="verification_profile_device_verified_because">Deze sessie wordt vertrouwd voor veilig berichtenverkeer omdat %1$s (%2$s) deze heeft geverifieerd:</string>
     <string name="room_member_profile_failed_to_get_devices">Kan geen sessies ophalen</string>
@@ -2054,7 +2017,7 @@
     <string name="settings_server_default_room_version">Standaardversie</string>
     <string name="settings_server_room_versions">Kamerversies 👓</string>
     <string name="settings_server_upload_size_unknown">De limiet is onbekend.</string>
-    <string name="settings_server_upload_size_content">Uw thuisserver accepteert bijlagen (bestanden, media, enz.) met een grootte tot %s.</string>
+    <string name="settings_server_upload_size_content">Uw server accepteert bijlagen (bestanden, media, enz.) met een grootte tot %s.</string>
     <string name="settings_server_upload_size_title">Server limiet voor het uploaden van bestanden</string>
     <string name="settings_server_version">Serverversie</string>
     <string name="settings_server_name">Server naam</string>
@@ -2069,9 +2032,9 @@
 \nPrivésleutels zijn niet bekend</string>
     <string name="encryption_information_dg_xsigning_complete">Kruisondertekening is ingeschakeld
 \nPrivésleutels op het apparaat.</string>
-    <string name="verification_conclusion_ok_self_notice">Uw nieuwe sessie is nu geverifieerd. Het heeft toegang tot uw gecodeerde berichten en andere gebruikers zullen het als vertrouwd zien.</string>
-    <string name="verification_conclusion_ok_notice">Berichten met deze gebruiker zijn end-to-end-versleuteld en kunnen niet door derden worden gelezen.</string>
-    <string name="verification_code_notice">Vergelijk de code met die op het scherm van de andere gebruiker.</string>
+    <string name="verification_conclusion_ok_self_notice">Uw nieuwe sessie is nu geverifieerd. Het heeft toegang tot uw gecodeerde berichten en andere personen zullen het als vertrouwd zien.</string>
+    <string name="verification_conclusion_ok_notice">Berichten met deze persoon zijn end-to-end-versleuteld en kunnen niet door derden worden gelezen.</string>
+    <string name="verification_code_notice">Vergelijk de code met die op het scherm van de andere persoon.</string>
     <string name="verification_emoji_notice">Vergelijk de unieke emoji en zorg ervoor dat ze in dezelfde volgorde verschijnen.</string>
     <string name="verification_request_start_notice">Doe dit voor de zekerheid persoonlijk of gebruik een andere manier om te communiceren.</string>
     <string name="verification_request_notice">Om veilig te zijn, verifieert u %s door een eenmalige code te controleren.</string>
@@ -2099,7 +2062,6 @@
 \nUw berichten zijn beveiligd met sloten en alleen u en de ontvanger hebben de unieke sleutels om ze te ontgrendelen.</string>
     <string name="direct_room_profile_not_encrypted_subtitle">Berichten hier zijn niet end-to-end-versleuteld.</string>
     <string name="room_profile_not_encrypted_subtitle">Berichten in deze kamer zijn niet end-to-end-versleuteld.</string>
-
     <string name="verification_request_waiting_for">Wachten op %s…</string>
     <string name="verification_no_scan_emoji_title">Verifieer door emoji\'s te vergelijken</string>
     <string name="verification_scan_self_emoji_subtitle">Verifieer door emoji te vergelijken</string>
@@ -2107,15 +2069,15 @@
     <string name="verification_scan_with_this_device">Scannen met dit apparaat</string>
     <string name="verification_scan_their_code">Scan hun code</string>
     <string name="verification_scan_self_notice">Scan de code met uw ander apparaat of wissel en scan met dit apparaat</string>
-    <string name="verification_scan_notice">Scan de code met het apparaat van de andere gebruiker om elkaar veilig te verifiëren</string>
+    <string name="verification_scan_notice">Scan de code met het apparaat van de andere persoon om elkaar veilig te verifiëren</string>
     <string name="verification_verify_device">Deze sessie verifiëren</string>
     <string name="sent_a_reaction">Gereageerd met: %s</string>
     <string name="verification_conclusion_compromised">"Een van de volgende zaken kan worden aangetast:
 \n
-\n  - Uw thuisserver
-\n  - De thuisserver waarmee de gebruiker die u verifieert is verbonden
-\n  - De internetverbinding van u of de andere gebruikers
-\n  - Het apparaat van u of van andere gebruikers"</string>
+\n  - Uw server
+\n  - De server waarmee de gebruiker die u verifieert is verbonden
+\n  - De internetverbinding van u of de andere personen
+\n  - Het apparaat van u of van andere personen"</string>
     <string name="verification_sas_do_not_match">Ze komen niet overeen</string>
     <string name="verification_conclusion_warning">Niet-vertrouwd inloggen</string>
     <string name="login_error_threepid_denied">Uw e-maildomein is niet geautoriseerd om op deze server te registreren</string>
@@ -2125,7 +2087,7 @@
     <string name="create_room_alias_empty">Geef een kameradres op</string>
     <string name="create_room_alias_already_in_use">Dit adres is al in gebruik</string>
     <string name="create_space_alias_hint">Space adres</string>
-    <string name="create_room_disable_federation_description">U kunt dit inschakelen als de kamer alleen wordt gebruikt voor samenwerking met interne teams op uw thuisserver. Dit kan later niet meer worden gewijzigd.</string>
+    <string name="create_room_disable_federation_description">U kunt dit inschakelen als de kamer alleen wordt gebruikt voor samenwerking met interne teams op uw server. Dit kan later niet meer worden gewijzigd.</string>
     <string name="create_room_disable_federation_title">Blokkeer iedereen die geen deel uitmaakt van %s om ooit deel te nemen aan deze kamer</string>
     <string name="hide_advanced">Verberg geavanceerd</string>
     <string name="show_advanced">Toon geavanceerd</string>
@@ -2140,7 +2102,7 @@
     <string name="settings_developer_mode_summary">De ontwikkelaarsmodus activeert verborgen functies en kan de applicatie ook minder stabiel maken. Alleen voor ontwikkelaars!</string>
     <string name="bug_report_error_too_short">De beschrijving is te kort</string>
     <string name="permalink_malformed">Uw matrix.to link is onjuist opgemaakt</string>
-    <string name="soft_logout_sso_not_same_user_error">De huidige sessie is voor gebruiker %1$s en u geeft inloggegevens op voor gebruiker %2$s. Dit wordt niet ondersteund door ${app_name}.
+    <string name="soft_logout_sso_not_same_user_error">De huidige sessie is voor gebruiker %1$s en u geeft inloggegevens op voor persoon %2$s. Dit wordt niet ondersteund door ${app_name}.
 \nWis eerst de gegevens en meld u vervolgens opnieuw aan met een ander account.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">U raakt de toegang tot beveiligde berichten kwijt, tenzij u zich aanmeldt om uw versleutelingssleutels te herstellen.</string>
     <string name="soft_logout_clear_data_dialog_content">Alle gegevens wissen die momenteel op dit apparaat zijn opgeslagen\?
@@ -2151,7 +2113,7 @@
 \nWis het als u klaar bent met het gebruik van dit apparaat of als u zich wilt aanmelden bij een ander account.</string>
     <string name="soft_logout_clear_data_title">Persoonlijke gegevens wissen</string>
     <string name="soft_logout_signin_e2e_warning_notice">Log in om versleutelingssleutels te herstellen die exclusief op dit apparaat zijn opgeslagen. Je hebt ze nodig om al uw beveiligde berichten op elk apparaat te lezen.</string>
-    <string name="soft_logout_signin_notice">Uw thuisserver (%1$s) beheerder heeft u uitgelogd van uw account %2$s (%3$s).</string>
+    <string name="soft_logout_signin_notice">Uw server (%1$s) beheerder heeft u uitgelogd van uw account %2$s (%3$s).</string>
     <string name="soft_logout_title">Je bent uitgelogd</string>
     <string name="signed_out_submit">Opnieuw inloggen</string>
     <string name="signed_out_notice">Het kan verschillende redenen hebben:
@@ -2162,30 +2124,30 @@
 \n
 \n• De beheerder van uw server heeft uw toegang om veiligheidsredenen ongeldig gemaakt.</string>
     <string name="signed_out_title">Je bent uitgelogd</string>
-    <string name="autodiscover_well_known_error">Kan geen geldige thuisserver vinden. Controleer uw ID a.u.b.</string>
-    <string name="login_signin_matrix_id_error_invalid_matrix_id">Dit is geen geldige gebruikers-ID. Verwacht formaat: \'@gebruiker:thuisserver.org\'</string>
+    <string name="autodiscover_well_known_error">Kan geen geldige server vinden. Controleer uw ID a.u.b.</string>
+    <string name="login_signin_matrix_id_error_invalid_matrix_id">Dit is geen geldige persoon-ID. Verwacht formaat: \'@persoon:server.org\'</string>
     <string name="login_signin_matrix_id_password_notice">Als u uw wachtwoord niet weet, gaat u terug om het opnieuw in te stellen.</string>
-    <string name="login_signin_matrix_id_notice">Als je een account aanmaakt op een thuisserver, gebruik dan je Matrix ID (bijv. @gebruiker:domein.nl) en wachtwoord hieronder.</string>
+    <string name="login_signin_matrix_id_notice">Als je een account aanmaakt op een server, gebruik dan je Matrix ID (bijv. @persoon:domein.nl) en wachtwoord hieronder.</string>
     <string name="login_signin_matrix_id_title">Aanmelden met Matrix ID</string>
     <string name="login_connect_using_matrix_id_submit">Aanmelden met Matrix ID</string>
     <plurals name="login_error_limit_exceeded_retry_after">
         <item quantity="one">Er zijn te veel verzoeken verzonden. Je kunt het over %1$d seconde opnieuw proberen…</item>
         <item quantity="other">Er zijn te veel verzoeken verzonden. Je kunt het over %1$d seconden opnieuw proberen…</item>
     </plurals>
-    <string name="login_error_outdated_homeserver_warning_content">Deze thuisserver draait op een oude versie. Vraag uw thuisserver beheerder om te upgraden. U kunt doorgaan, maar sommige functies werken mogelijk niet correct.</string>
+    <string name="login_error_outdated_homeserver_warning_content">Deze server draait op een oude versie. Vraag uw server beheerder om te upgraden. U kunt doorgaan, maar sommige functies werken mogelijk niet correct.</string>
     <string name="login_validation_code_is_not_correct">De ingevoerde code is niet correct. Gelieve dit te controleren.</string>
     <string name="login_wait_for_email_notice">We hebben zojuist een e-mail gestuurd naar %1$s.
 \nKlik op de link die deze bevat om door te gaan met het aanmaken van een account.</string>
     <string name="login_wait_for_email_title">Controleer uw e-mail</string>
     <string name="login_terms_title">Accepteer de voorwaarden om door te gaan</string>
     <string name="login_a11y_captcha_container">Voer de captcha uitdaging uit</string>
-    <string name="login_a11y_choose_other">Selecteer een aangepaste thuisserver</string>
+    <string name="login_a11y_choose_other">Selecteer een aangepaste server</string>
     <string name="login_a11y_choose_modular">Selecteer Element Matrix Services</string>
     <string name="login_signup_cancel_confirmation_content">Uw account is nog niet aangemaakt.
 \n
 \nHet registratieproces stoppen\?</string>
-    <string name="login_signup_error_user_in_use">Die gebruikersnaam is in gebruik</string>
-    <string name="login_signin_username_hint">Gebruikersnaam of e-mail</string>
+    <string name="login_signup_error_user_in_use">Deze inlognaam is in gebruik</string>
+    <string name="login_signin_username_hint">Inlognaam of e-mailadres</string>
     <string name="login_signup_to">Meld u aan bij %1$s</string>
     <string name="login_msisdn_error_other">Telefoonnummer lijkt ongeldig. Controleer het alstublieft</string>
     <string name="login_msisdn_error_not_international">Internationale telefoonnummers moeten beginnen met \'+\'</string>
@@ -2216,7 +2178,6 @@
     <string name="upgrade_room_for_restricted_no_param">Iedereen in een ouderkamer kan deze kamer vinden en er lid van worden. Het is niet nodig om iedereen handmatig uit te nodigen. U kunt dit op elk moment wijzigen in de kamer instellingen.</string>
     <string name="upgrade_room_warning">Het upgraden van een kamer is een geavanceerde actie en wordt meestal aanbevolen wanneer een kamer onstabiel is vanwege bugs, ontbrekende functies of beveiligingsproblemen.
 \nDit heeft meestal alleen invloed op hoe de kamer op de server wordt verwerkt.</string>
-
     <string name="space_settings_manage_rooms">Beheer kamers</string>
     <string name="space_leave_prompt_msg_as_admin">U bent de enige beheerder van deze kamer. Als u het verlaat, betekent dit dat niemand er controle over heeft.</string>
     <string name="room_alias_preview_not_found">Deze alias is momenteel niet toegankelijk.
@@ -2229,7 +2190,7 @@
     <string name="tooltip_attachment_contact">Contacten openen</string>
     <string name="tooltip_attachment_sticker">Stuur sticker</string>
     <string name="tooltip_attachment_file">Upload bestand</string>
-    <string name="tooltip_attachment_gallery">Afbeeldingen en video\'s verzenden</string>
+    <string name="tooltip_attachment_gallery">Afbeeldingen en video\'s versturen</string>
     <string name="tooltip_attachment_photo">Open camera</string>
     <string name="delete_poll_dialog_content">Weet u zeker dat u deze poll wilt verwijderen\? U kunt het niet meer herstellen nadat het is verwijderd.</string>
     <string name="delete_poll_dialog_title">Poll verwijderen</string>
@@ -2279,10 +2240,10 @@
     <string name="a11y_start_voice_message">Spraakbericht opnemen</string>
     <string name="error_failed_to_join_room">Sorry, er is een fout opgetreden bij het proberen deel te nemen aan: %s</string>
     <string name="room_upgrade_to_recommended_version">Upgrade naar de aanbevolen kamerversie</string>
-    <string name="room_using_unstable_room_version">In deze kamer wordt versie %s gebruikt, die door deze thuisserver als onstabiel is gemarkeerd.</string>
+    <string name="room_using_unstable_room_version">In deze kamer wordt versie %s gebruikt, die door deze server als onstabiel is gemarkeerd.</string>
     <string name="upgrade_room_no_power_to_manage">U heeft toestemming nodig om een kamer te upgraden</string>
     <string name="upgrade_room_update_parent_space">Bovenliggende space automatisch bijwerken</string>
-    <string name="upgrade_room_auto_invite">Gebruikers automatisch uitnodigen</string>
+    <string name="upgrade_room_auto_invite">Personen automatisch uitnodigen</string>
     <string name="upgrade_public_room_from_to">U update de kamer van %1$s naar %2$s.</string>
     <string name="upgrade_private_room">Upgrade privékamer</string>
     <string name="upgrade_public_room">Upgrade openbare kamer</string>
@@ -2294,8 +2255,8 @@
     <string name="this_space_has_no_rooms_not_admin">Sommige kamers zijn mogelijk verborgen omdat ze privé zijn en u een uitnodiging nodig heeft.
 \nU heeft geen rechten om kamers toe te voegen.</string>
     <string name="this_space_has_no_rooms">Deze space heeft geen kamers</string>
-    <string name="spaces_no_server_support_description">Neem contact op met uw thuisserver beheerder voor meer informatie</string>
-    <string name="spaces_no_server_support_title">Het lijkt erop dat je thuisserver nog geen Spaces ondersteunt</string>
+    <string name="spaces_no_server_support_description">Neem contact op met uw server beheerder voor meer informatie</string>
+    <string name="spaces_no_server_support_title">Het lijkt erop dat je server nog geen Spaces ondersteunt</string>
     <string name="spaces_feeling_experimental_subspace">Experimenteel voelen\?
 \nU kunt bestaande spaces aan een space toevoegen.</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">Alle kamers waarin u deelneemt, worden weergegeven in Home.</string>
@@ -2319,9 +2280,9 @@
     <string name="space_leave_prompt_msg_private">U kunt pas weer deelnemen als u opnieuw wordt uitgenodigd.</string>
     <string name="space_leave_prompt_msg_only_you">U bent de enige persoon hier. Als u weggaat, kan niemand meer meedoen, ook u niet.</string>
     <string name="space_leave_prompt_msg_with_name">Weet u zeker dat u %s wilt verlaten\?</string>
-    <string name="leave_space">Verlaat Space</string>
+    <string name="leave_space">Verlaat</string>
     <string name="space_add_child_title">Kamers toevoegen</string>
-    <string name="space_explore_activity_title">Kamers verkennen</string>
+    <string name="space_explore_activity_title">Kamers ontdekken</string>
     <plurals name="space_people_you_know">
         <item quantity="one">%d persoon die u kent is al lid geworden</item>
         <item quantity="other">%d mensen die u kent zijn al lid geworden</item>
@@ -2336,10 +2297,10 @@
     <string name="skip_for_now">Voor nu overslaan</string>
     <string name="invite_just_to_this_room_desc">Ze zullen geen deel uitmaken van %s</string>
     <string name="invite_just_to_this_room">Alleen voor deze kamer</string>
-    <string name="invite_to_space_with_name_desc">Ze kunnen %s verkennen</string>
+    <string name="invite_to_space_with_name_desc">Ze kunnen %s ontdekken</string>
     <string name="invite_to_space_with_name">Uitnodigen voor %s</string>
     <string name="invite_by_link">Deel link</string>
-    <string name="invite_by_username_or_mail">Uitnodigen via gebruikersnaam of e-mail</string>
+    <string name="invite_by_username_or_mail">Uitnodigen via inlognaam of e-mailadres</string>
     <string name="invite_by_email">uitnodiging via e-mail</string>
     <string name="invite_people_to_your_space_desc">Het is alleen u op dit moment. %s zal nog beter zijn met anderen.</string>
     <string name="invite_to_space">Uitnodigen voor %s</string>
@@ -2360,10 +2321,10 @@
     <string name="create_spaces_me_and_teammates">Ik en teamgenoten</string>
     <string name="create_spaces_organise_rooms">Een privé space om je kamers te organiseren</string>
     <string name="create_spaces_just_me">Alleen ik</string>
-    <string name="create_spaces_make_sure_access">Zorg ervoor dat de juiste mensen toegang hebben tot %s. U kunt dit later wijzigen.</string>
+    <string name="create_spaces_make_sure_access">Zorg ervoor dat de juiste mensen toegang hebben tot %s.</string>
     <string name="create_spaces_who_are_you_working_with">Met wie werkt u samen\?</string>
     <string name="create_spaces_you_can_change_later">U kunt dit later wijzigen</string>
-    <string name="create_spaces_choose_type_label">Wat voor soort space wilt u creëren\?</string>
+    <string name="create_spaces_choose_type_label">Wat voor soort space wilt u aanmaken\?</string>
     <string name="your_private_space">Uw privé space</string>
     <string name="your_public_space">Uw openbare space</string>
     <string name="add_space">Space toevoegen</string>
@@ -2371,7 +2332,7 @@
     <string name="public_space">Openbare space</string>
     <string name="event_status_delete_all_failed_dialog_title">Niet verzonden berichten verwijderen</string>
     <string name="event_status_failed_messages_warning">Berichten kunnen niet worden verzonden</string>
-    <string name="event_status_cancel_sending_dialog_message">Wilt u het verzenden van een bericht annuleren\?</string>
+    <string name="event_status_cancel_sending_dialog_message">Wilt u het versturen van een bericht annuleren\?</string>
     <string name="event_status_a11y_delete_all">Alle mislukte berichten verwijderen</string>
     <string name="command_description_upgrade_room">Upgrade een kamer naar een nieuwe versie</string>
     <string name="command_description_leave_room">Verlaat kamer met gegeven id (of huidige kamer indien leeg)</string>
@@ -2383,7 +2344,7 @@
     <string name="ftue_auth_carousel_encrypted_title">Veilig berichtenverkeer.</string>
     <string name="ftue_auth_carousel_control_title">U heeft de controle.</string>
     <string name="tooltip_attachment_location">Deel locatie</string>
-    <string name="labs_render_locations_in_timeline">Gebruikerslocaties in de tijdlijn weergeven</string>
+    <string name="labs_render_locations_in_timeline">Persoonslocaties in de tijdlijn weergeven</string>
     <string name="settings_enable_location_sharing_summary">Eenmaal ingeschakeld, kun je je locatie naar elke kamer sturen</string>
     <string name="settings_enable_location_sharing">Locatie delen inschakelen</string>
     <string name="location_share_external">Open met</string>
@@ -2411,8 +2372,8 @@
     <string name="ftue_auth_carousel_control_body">Kies waar je gesprekken worden bewaard, zodat u controle en onafhankelijkheid heeft. Verbonden via Matrix.</string>
     <string name="ftue_auth_carousel_secure_body">Veilige en onafhankelijke communicatie die u dezelfde mate van privacy geeft als een persoonlijk gesprek in uw eigen huis.</string>
     <string name="attachment_type_location">Locatie</string>
-    <string name="room_unsupported_e2e_algorithm_as_admin">De versleuteling is verkeerd geconfigureerd, zodat u geen berichten kunt verzenden. Klik om instellingen te openen.</string>
-    <string name="room_unsupported_e2e_algorithm">De versleuteling is verkeerd geconfigureerd, zodat u geen berichten kunt verzenden. Neem contact op met een beheerder om de versleuteling in een geldige staat te herstellen.</string>
+    <string name="room_unsupported_e2e_algorithm_as_admin">De versleuteling is verkeerd geconfigureerd, zodat u geen berichten kunt versturen. Klik om instellingen te openen.</string>
+    <string name="room_unsupported_e2e_algorithm">De versleuteling is verkeerd geconfigureerd, zodat u geen berichten kunt versturen. Neem contact op met een beheerder om de versleuteling in een geldige staat te herstellen.</string>
     <string name="message_bubbles">Toon bericht bubbels</string>
     <string name="location_timeline_failed_to_load_map">Kan kaart niet laden</string>
     <string name="a11y_static_map_image">Kaart</string>
@@ -2446,4 +2407,84 @@
     <string name="action_thread_copy_link_to_thread">Kopieer link naar discussie</string>
     <string name="action_thread_view_in_room">Bekijk in kamer</string>
     <string name="action_view_threads">Discussies bekijken</string>
+    <string name="room_message_autocomplete_users">Personen</string>
+    <string name="error_forbidden_digits_only_username">De server accepteert geen inlognaam met alleen cijfers.</string>
+    <string name="room_message_autocomplete_notification">Kamer notificatie</string>
+    <string name="room_message_notify_everyone">Breng de hele kamer op de hoogte</string>
+    <plurals name="message_reaction_show_more">
+        <item quantity="one">%1$d meer</item>
+        <item quantity="other">%1$d meer</item>
+    </plurals>
+    <string name="message_reaction_show_less">Toon minder</string>
+    <string name="live_location_sharing_notification_description">Locatie delen is bezig</string>
+    <string name="live_location_sharing_notification_title">${app_name} Live locatie</string>
+    <string name="location_share_live_stop">Stop</string>
+    <string name="location_share_live_enabled">Live locatie ingeschakeld</string>
+    <string name="location_in_background_missing_permission_dialog_content">Als u de Live-locatie wilt delen, heeft ${app_name} altijd locatietoegang nodig als de app op de achtergrond actief is.
+\nWe hebben alleen toegang tot uw locatie voor de duur die u kiest.</string>
+    <string name="location_in_background_missing_permission_dialog_title">Toegang te verlenen</string>
+    <string name="a11y_location_share_option_pinned_icon">Deel deze locatie</string>
+    <string name="location_share_option_pinned">Deel deze locatie</string>
+    <string name="a11y_location_share_option_user_live_icon">Live locatie delen</string>
+    <string name="location_share_option_user_live">Live locatie delen</string>
+    <string name="a11y_location_share_option_user_current_icon">Deel mijn huidige locatie</string>
+    <string name="location_share_option_user_current">Deel mijn huidige locatie</string>
+    <string name="a11y_location_share_locate_button">Zoom naar huidige locatie</string>
+    <string name="a11y_location_share_pin_on_map">Pin van geselecteerde locatie op kaart</string>
+    <string name="ftue_personalize_skip_this_step">Sla deze stap over</string>
+    <string name="ftue_personalize_submit">Opslaan en doorgaan</string>
+    <string name="ftue_personalize_complete_subtitle">Je voorkeuren zijn opgeslagen.</string>
+    <string name="ftue_personalize_complete_title">Alles gereed!</string>
+    <string name="ftue_personalize_lets_go">Laten we beginnen</string>
+    <string name="ftue_profile_picture_subtitle">U kunt dit op elk moment wijzigen.</string>
+    <string name="ftue_profile_picture_title">Voeg een profielfoto toe</string>
+    <string name="ftue_display_name_entry_footer">U kunt dit later wijzigen</string>
+    <string name="ftue_display_name_entry_title">Weergavenaam</string>
+    <string name="ftue_display_name_subtitle">Dit wordt weergegeven wanneer u berichten verzendt.</string>
+    <string name="ftue_display_name_title">Kies een weergavenaam</string>
+    <string name="ftue_account_created_subtitle">Uw account %s is aangemaakt.</string>
+    <string name="ftue_account_created_congratulations_title">Gefeliciteerd!</string>
+    <string name="ftue_account_created_take_me_home">Breng me naar het begin</string>
+    <string name="ftue_account_created_personalize">Personaliseer profiel</string>
+    <string name="threads_notice_migration_message">We komen dichter bij het uitbrengen van een openbare bèta voor Discussies.
+\n
+\nTerwijl we ons erop voorbereiden, moeten we enkele wijzigingen aanbrengen: discussies die vóór dit punt zijn gemaakt, worden weergegeven als gewone antwoorden.
+\n
+\nDit zal een eenmalige overgang zijn, aangezien Discussies nu deel uitmaken van de Matrix-specificatie.</string>
+    <string name="threads_notice_migration_title">Discussies die bèta naderen 🎉</string>
+    <string name="room_notification_more_than_two_users_are_typing">%1$s, %2$s en anderen</string>
+    <string name="room_notification_two_users_are_typing">%1$s en %2$s</string>
+    <string name="action_disable">Uitzetten</string>
+    <plurals name="notice_room_server_acl_changes">
+        <item quantity="one">%d server ACL\'s veranderen</item>
+        <item quantity="other">%d server ACL\'s wijzigingen</item>
+    </plurals>
+    <string name="location_share_live_started">Live locatie laden…</string>
+    <string name="location_share_live_select_duration_option_3">8 uur</string>
+    <string name="location_share_live_select_duration_option_2">1 uur</string>
+    <string name="location_share_live_select_duration_option_1">15 minuten</string>
+    <string name="location_share_live_select_duration_title">Deel uw live locatie voor</string>
+    <string name="audio_message_file_size">(%1$s)</string>
+    <string name="audio_message_reply_content">%1$s (%2$s)</string>
+    <string name="error_audio_message_unable_to_play">%1$s kan niet worden afgeluisterd</string>
+    <string name="a11y_pause_audio_message">Pauze %1$s</string>
+    <string name="a11y_play_audio_message">Luister %1$s</string>
+    <string name="a11y_audio_playback_duration">%1$d minuten %2$d seconden</string>
+    <string name="a11y_audio_message_item">%1$s, %2$s, %3$s</string>
+    <string name="sent_live_location">Hun live locatie gedeeld</string>
+    <string name="ftue_auth_carousel_workplace_body">${app_name} is ook geweldig voor op de werkplek. Het wordt vertrouwd door \'s werelds veiligste organisaties.</string>
+    <string name="beta">BÈTA</string>
+    <string name="send_feedback_threads_info">Discussies zijn werk in uitvoering met nieuwe, opwindende aankomende functies, zoals verbeterde meldingen. We horen graag uw feedback!</string>
+    <string name="send_feedback_threads_title">Discussies Beta-feedback</string>
+    <string name="give_feedback_threads">Geef feedback</string>
+    <string name="beta_title_bottom_sheet_action">BÈTA</string>
+    <string name="settings_presence_user_always_appears_offline_summary">Indien ingeschakeld, verschijnt u altijd offline voor andere personen, zelfs wanneer u de applicatie gebruikt.</string>
+    <string name="settings_presence_user_always_appears_offline">Offline modus</string>
+    <string name="settings_presence">Aanwezigheid</string>
+    <string name="threads_labs_enable_notice_message">Uw server ondersteunt momenteel geen discussies, dus deze functie kan onbetrouwbaar zijn. Sommige berichten in een discussie zijn mogelijk niet betrouwbaar beschikbaar. %sWilt u toch discussies inschakelen\?</string>
+    <string name="threads_labs_enable_notice_title">Discussies bèta</string>
+    <string name="threads_beta_enable_notice_message">Discussies helpen uw gesprekken on-topic te houden en gemakkelijk bij te houden. %s Als u discussies inschakelt, wordt de app vernieuwd. Bij sommige accounts kan dit langer duren.</string>
+    <string name="threads_beta_enable_notice_title">Discussies bèta</string>
+    <string name="action_learn_more">Leer meer</string>
+    <string name="action_try_it_out">Probeer het uit</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index fe98d6b6a1..f6b714bdc2 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="notice_room_invite_no_invitee">Zaproszenie od %s</string>
     <string name="notice_room_invite">%1$s zaprosił(a) %2$s</string>
     <string name="notice_room_invite_you">%1$s zaprosił(a) Cię</string>
@@ -287,22 +287,21 @@
     <string name="permissions_rationale_msg_camera_and_audio">${app_name} wymaga dostępu do kamery i mikrofonu, aby przeprowadzać rozmowy wideo.
 \n
 \nPrzyznaj dostęp w następnym oknie.</string>
-    <string name="list_members">Lista uczestników</string>
+    <string name="list_members">Członkowie</string>
     <plurals name="room_title_members">
-        <item quantity="one">1 członek</item>
-        <item quantity="few">kilku członków</item>
+        <item quantity="one">%d członek</item>
+        <item quantity="few">%d członków</item>
         <item quantity="many">%d członków</item>
-        <item quantity="other"/>
+        <item quantity="other">%d członków</item>
     </plurals>
     <string name="room_participants_power_level_prompt">Nie będziesz w stanie cofnąć tej zmiany, ponieważ przyznajesz użytkownikowi uprawnienia równe swoim.
-\n
 \nJesteś pewien\?</string>
-    <string name="room_participants_ban_prompt_msg">Zbanowanie użytkownika usunie go z tego pokoju i uniemożliwi ponowne dołączenie.</string>
+    <string name="room_participants_ban_prompt_msg">Zablokowanie użytkownika usunie go z tego pokoju i uniemożliwi ponowne dołączenie.</string>
     <plurals name="room_new_messages_notification">
-        <item quantity="one">Nowa wiadomość</item>
-        <item quantity="few">Kilka nowych wiadomości</item>
+        <item quantity="one">%d nowa wiadomość</item>
+        <item quantity="few">%d nowe wiadomości</item>
         <item quantity="many">%d nowych wiadomości</item>
-        <item quantity="other"/>
+        <item quantity="other">%d nowych wiadomości</item>
     </plurals>
     <string name="ssl_cert_not_trust">Może to oznaczać że ktoś zakłóca twoje połączenie, lub Twój telefon nie ufa certyfikatowi dostarczonemu przez zdalny serwer.</string>
     <string name="ssl_cert_new_account_expl">Jeśli administrator serwera oświadczył, że jest to oczekiwane, upewnij się, że poniższy odcisk palca odpowiada odciskowi palca dostarczonemu przez niego.</string>
@@ -539,7 +538,8 @@
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Przywrócono kopię zapasową z %d kluczem.</item>
         <item quantity="few">Przywrócono kopię zapasową z %d kluczami.</item>
-        <item quantity="many"/>
+        <item quantity="many">Przywrócono kopię zapasową z %d kluczami.</item>
+        <item quantity="other">Przywrócono kopię zapasową z %d kluczami.</item>
     </plurals>
     <string name="title_activity_keys_backup_restore">Użyj kopii zapasowej klucza</string>
     <string name="settings_troubleshoot_diagnostic_running_status">Uruchamianie… (%1$d z %2$d)</string>
@@ -736,7 +736,7 @@
 \nMenedżerzy integracji odbierają dane konfiguracji, modyfikują widżety, wysyłają zaproszenia do pokojów i ustawiają poziomy uprawnień w Twoim imieniu.</string>
     <string name="settings_inline_url_preview_summary">Pokaż podgląd linków wewnątrz czatu jeśli twój serwer wspiera tę funkcję.</string>
     <string name="settings_send_markdown_summary">Formatuj wiadomości używając składni Markdown zanim zostaną wysłane. Pozwala to na zaawansowane formatowanie takie jak używanie asterysków do wyświetlania tekstu w kursywie.</string>
-    <string name="settings_show_join_leave_messages_summary">Nie wpływa to na zaproszenia, wyrzucenia oraz bany.</string>
+    <string name="settings_show_join_leave_messages_summary">Zaproszenia, usunięcia i bany pozostają nienaruszone.</string>
     <string name="settings_send_message_with_enter">Wysyłaj wiadomości za pomocą klawisza enter</string>
     <string name="settings_send_message_with_enter_summary">Przycisk enter na klawiaturze programowej wyśle wiadomość zamiast wprowadzania łamanania linii</string>
     <string name="settings_discovery_category">Znajdź</string>
@@ -747,13 +747,14 @@
     <plurals name="notification_compat_summary_line_for_room">
         <item quantity="one">%1$s: %2$d wiadomość</item>
         <item quantity="few">%1$s: %2$d wiadomości</item>
-        <item quantity="many"/>
-        <item quantity="other"/>
+        <item quantity="many">%1$s: %2$d wiadomości</item>
+        <item quantity="other">%1$s: %2$d wiadomości</item>
     </plurals>
     <plurals name="notification_compat_summary_title">
         <item quantity="one">%d powiadomienie</item>
-        <item quantity="few">%d powiadomień</item>
-        <item quantity="many"/>
+        <item quantity="few">%d powiadomienia</item>
+        <item quantity="many">%d powiadomień</item>
+        <item quantity="other">%d powiadomień</item>
     </plurals>
     <string name="notification_unknown_new_event">Nowe wydarzenie</string>
     <string name="notification_new_messages">Nowe wiadomości</string>
@@ -825,9 +826,10 @@
     <string name="keys_backup_banner_update_line2">Zarządzaj w Kopii Zapasowej Kluczy</string>
     <string name="keys_backup_banner_in_progress">Tworzenei kopii zapasowej kluczy…</string>
     <plurals name="keys_backup_info_keys_backing_up">
-        <item quantity="one">Kopiowanie %d klucza…</item>
-        <item quantity="few">Kopiowanie %d kluczy…</item>
-        <item quantity="many"/>
+        <item quantity="one">Tworzenie kopii zapasowej %d klucza…</item>
+        <item quantity="few">Tworzenie kopii zapasowej %d kluczy…</item>
+        <item quantity="many">Tworzenie kopii zapasowej %d kluczy…</item>
+        <item quantity="other">Tworzenie kopii zapasowej %d kluczy…</item>
     </plurals>
     <string name="settings_troubleshoot_test_bing_settings_failed">Niektóre powiadomienia są wyłączone w osobistej konfiguracji.</string>
     <string name="settings_troubleshoot_test_play_services_success">Usługi Google Play są aktualne.</string>
@@ -888,8 +890,8 @@
     <plurals name="fallback_users_read">
         <item quantity="one">%d użytkownik odczytał</item>
         <item quantity="few">%d użytkowników odczytało</item>
-        <item quantity="many"/>
-        <item quantity="other"/>
+        <item quantity="many">%d użytkowników odczytało</item>
+        <item quantity="other">%d użytkowników odczytało</item>
     </plurals>
     <string name="error_attachment">Wystąpił błąd poczas otrzymywania załącznika.</string>
     <string name="error_handling_incoming_share">Nie można obsłużyć otrzymanych danych</string>
@@ -999,9 +1001,10 @@
     <string name="login_validation_code_is_not_correct">Wprowadzony kod jest nieprawidłowy. Sprawdź.</string>
     <string name="login_error_outdated_homeserver_title">Nieaktualny serwer domowy</string>
     <plurals name="login_error_limit_exceeded_retry_after">
-        <item quantity="one">Zostało wysłane zbyt wiele żądań. Możesz spróbować ponownie za %1$d sekundę…</item>
-        <item quantity="few">Zostało wysłane zbyt wiele żądań. Możesz spróbować ponownie za %1$d sekundy…</item>
-        <item quantity="many"/>
+        <item quantity="one">Wysłano zbyt wiele próśb. Możesz spróbować ponownie za %1$d sekundę…</item>
+        <item quantity="few">Wysłano zbyt wiele próśb. Możesz spróbować ponownie za %1$d sekundy…</item>
+        <item quantity="many">Wysłano zbyt wiele próśb. Możesz spróbować ponownie za %1$d sekund…</item>
+        <item quantity="other">Wysłano zbyt wiele próśb. Możesz spróbować ponownie za %1$d sekund…</item>
     </plurals>
     <string name="signed_out_title">Wylogowałeś(-łaś) się</string>
     <string name="signed_out_notice">Mogło to się stać z wielu powodów:
@@ -1081,8 +1084,9 @@
     <string name="room_profile_section_security_learn_more">Dowiedz się więcej</string>
     <plurals name="room_profile_section_more_member_list">
         <item quantity="one">Jedna osoba</item>
-        <item quantity="few">%1$d osób</item>
-        <item quantity="many"/>
+        <item quantity="few">%1$d osoby</item>
+        <item quantity="many">%1$d osób</item>
+        <item quantity="other">%1$d osób</item>
     </plurals>
     <string name="room_profile_leaving_room">Opuszczanie pokoju…</string>
     <string name="room_member_power_level_admins">Administratorzy</string>
@@ -1104,8 +1108,7 @@
     <string name="settings_category_timeline">Oś czasu</string>
     <string name="settings_category_composer">Edycja wiadomości</string>
     <string name="room_settings_enable_encryption_dialog_title">Aktywować szyfrowanie\?</string>
-    <string name="room_settings_enable_encryption_dialog_content">Raz włączone szyfrowanie w pokoju nie może zostać wyłączone. Wiadomości wysłane w zaszyfrowanym pokoju nie są widziane przez serwer, a jedynie przez uczestników w pokoju.
-\nAktywowanie szyfrowania może uniemożliwić wielu botom i mostom prawidłowe działanie.</string>
+    <string name="room_settings_enable_encryption_dialog_content">Raz włączone szyfrowanie w pokoju nie może zostać wyłączone. Wiadomości wysłane w zaszyfrowanym pokoju nie są widziane przez serwer, a jedynie przez uczestników w pokoju. Aktywowanie szyfrowania może uniemożliwić wielu botom i mostkom prawidłowe działanie.</string>
     <string name="room_settings_enable_encryption_dialog_submit">Aktywuj szyfrowanie</string>
     <string name="verification_request_notice">Aby być bezpiecznym, zweryfikuj %s poprzez sprawdzenie jednorazowego kodu.</string>
     <string name="verification_request_start_notice">Aby być bezpiecznym, zrób to osobiście lub użyj innej metody komunikacji.</string>
@@ -1131,8 +1134,9 @@
     <string name="settings_active_sessions_unverified_device_desc">Zweryfikuj tą sesję aby oznaczyć ją jako zaufaną i przyznać jej dostęp do zaszyfrowanych wiadomości. Jeżeli nie logowałeś(-łaś) się do tej sesji, twoje konto mogło zostać naruszone:</string>
     <plurals name="settings_active_sessions_count">
         <item quantity="one">%d aktywna sesja</item>
-        <item quantity="few">%d aktywnych sesji</item>
-        <item quantity="many"/>
+        <item quantity="few">%d aktywne sesje</item>
+        <item quantity="many">%d aktywnych sesji</item>
+        <item quantity="other">%d aktywnych sesji</item>
     </plurals>
     <string name="crosssigning_verify_this_session">Zweryfikuj tą sesję</string>
     <string name="verification_open_other_to_verify">Otwórz obecną sesję i użyj jej do zweryfikowania obecnej, przyznając jej dostęp do zaszyfrowanych wiadomości.</string>
@@ -1161,7 +1165,8 @@
     <plurals name="send_images_with_original_size">
         <item quantity="one">Wyślij obraz w oryginalnym rozmiarze</item>
         <item quantity="few">Wyślij obrazy w oryginalnym rozmiarze</item>
-        <item quantity="many"/>
+        <item quantity="many">Wyślij obrazów w oryginalnym rozmiarze</item>
+        <item quantity="other">Wyślij obrazów w oryginalnym rozmiarze</item>
     </plurals>
     <string name="delete_event_dialog_title">Potwierdź Usunięcie</string>
     <string name="delete_event_dialog_content">Jesteś pewny(-na), że chcesz usunąć to wydarzenie\? Jeżeli usuniesz nazwę pokoju lub zmienisz temat, wciąż będzie możliwe cofnięcie zmiany.</string>
@@ -1354,9 +1359,9 @@
     <string name="active_widget_view_action">WIDOK</string>
     <plurals name="seconds">
         <item quantity="one">%d sekunda</item>
-        <item quantity="few">%d sek.</item>
-        <item quantity="many">%d sek.</item>
-        <item quantity="other">%d sek.</item>
+        <item quantity="few">%d sekundy</item>
+        <item quantity="many">%d sekund</item>
+        <item quantity="other">%d sekund</item>
     </plurals>
     <string name="settings_troubleshoot_test_push_loop_success">Aplikacja odebrała PUSH</string>
     <string name="settings_troubleshoot_test_push_loop_title">Przetestuj powiadomienia push</string>
@@ -1518,7 +1523,9 @@
     <string name="room_participants_remove_title">Wykop użytkownika</string>
     <string name="room_participants_action_cancel_invite_prompt_msg">Czy na pewno anulować zaproszenie dla tego użytkownika\?</string>
     <string name="room_participants_action_cancel_invite_title">Anuluj zaproszenie</string>
-    <string name="room_participants_action_unignore_prompt_msg">Zaprzestanie ignorowania użytkownika spowoduje ponowne wyświetlanie wszystkich jego wiadomości.</string>
+    <string name="room_participants_action_unignore_prompt_msg">Zaprzestanie ignorowania użytkownika spowoduje ponowne wyświetlanie wszystkich jego wiadomości.
+\n
+\nAplikacja uruchomi się ponownie aby zsynchronizować wiadomości, może to potrwać kilka chwil.</string>
     <string name="room_participants_action_unignore_title">Przestań ignorować użytkownika</string>
     <string name="room_participants_action_ignore_prompt_msg">Zignorowanie tego użytkownika usunie wszystkie jego wiadomości z pokojów, które współdzielicie.
 \n
@@ -1581,10 +1588,10 @@
     <string name="send_a_sticker">Naklejka</string>
     <string name="direct_room_join_rules_invite">%1$s wymaga otrzymania zaproszenia do dołączenia.</string>
     <plurals name="two_and_some_others_read">
-        <item quantity="one">%1$s, %2$s i %3$d czyta</item>
-        <item quantity="few">%1$s, %2$s i %3$d czytają</item>
-        <item quantity="many"/>
-        <item quantity="other"/>
+        <item quantity="one">%1$s, %2$s i %3$d inny czyta</item>
+        <item quantity="few">%1$s, %2$s i %3$d innych czyta</item>
+        <item quantity="many">%1$s, %2$s i %3$d innych czyta</item>
+        <item quantity="other">%1$s, %2$s i %3$d innych czyta</item>
     </plurals>
     <string name="room_alias_publish_to_directory_error">Nie udało się uzyskać widoczności katalogu bieżącego pokoju (%1$s).</string>
     <string name="settings_secure_backup_enter_to_setup">Skonfiguruj na tym urządzeniu</string>
@@ -1793,18 +1800,18 @@
     <string name="room_displayname_3_members">%1$s, %2$s i %3$s</string>
     <string name="link_this_email_with_your_account">%s w Ustawieniach, aby otrzymywać zaproszenia bezpośrednio w ${app_name}.</string>
     <string name="room_permissions_change_topic">Zmiana tematu</string>
-    <string name="room_permissions_upgrade_the_space">Aktualizacja Przestrzeni</string>
+    <string name="room_permissions_upgrade_the_space">Aktualizacja przestrzeni</string>
     <string name="room_permissions_upgrade_the_room">Aktualizacja pokoju</string>
     <string name="room_permissions_send_m_room_server_acl_events">Wysyłanie zdarzeń m.room.server_acl</string>
     <string name="room_permissions_change_permissions">Zmiana uprawnień</string>
-    <string name="room_permissions_change_space_name">Zmiana nazwy Przestrzeni</string>
+    <string name="room_permissions_change_space_name">Zmiana nazwy przestrzeni</string>
     <string name="room_permissions_change_room_name">Zmiana nazwy pokoju</string>
     <string name="room_permissions_change_history_visibility">Zmiana widoczności historii</string>
     <string name="room_permissions_enable_space_encryption">Włączanie szyfrowania przestrzeni</string>
     <string name="room_permissions_enable_room_encryption">Włączanie szyfrowania pokoju</string>
-    <string name="room_permissions_change_main_address_for_the_space">Zmiana głównego adresu Przestrzeni</string>
+    <string name="room_permissions_change_main_address_for_the_space">Zmiana głównego adresu przestrzeni</string>
     <string name="room_permissions_change_main_address_for_the_room">Zmiana głównego adresu pokoju</string>
-    <string name="room_permissions_change_space_avatar">Zmiana awatara Przestrzeni</string>
+    <string name="room_permissions_change_space_avatar">Zmiana awatara przestrzeni</string>
     <string name="room_permissions_change_room_avatar">Zmiana awatara pokoju</string>
     <string name="room_permissions_modify_widgets">Modyfikowanie widgetów</string>
     <string name="room_permissions_notify_everyone">Powiadamianie wszystkich</string>
@@ -1825,7 +1832,7 @@
     <string name="space_settings_permissions_title">Uprawnienia Przestrzeni</string>
     <string name="room_settings_permissions_title">Uprawnienia pokoju</string>
     <string name="space_participants_unban_prompt_msg">Odblokowanie użytkownika pozwoli mu na ponowne dołączenie do tej przestrzeni.</string>
-    <string name="space_participants_ban_prompt_msg">Blokowanie użytkowników wyrzuci ich z tej przestrzeni i uniemożliwi im dołączenie ponownie.</string>
+    <string name="space_participants_ban_prompt_msg">Zablokowanie użytkownika usunie go z tego miejsca i uniemożliwi ponowne dołączenie.</string>
     <string name="room_participants_leave_private_warning">Ten pokój jest prywatny. Nie będziesz w stanie dołączyć bez zaproszenia.</string>
     <string name="call_remove_jitsi_widget_progress">Zakańczanie połączenia…</string>
     <string name="call_ended_invite_timeout_title">Brak odpowiedzi</string>
@@ -1947,7 +1954,7 @@
     <string name="this_space_has_no_rooms_admin">Niektóre pokoje mogą być ukryte, gdyż są prywatne i wymagają od Ciebie zaproszenia.</string>
     <string name="this_space_has_no_rooms_not_admin">Niektóre pokoje mogą być ukryte, gdyż są prywatne i wymagają od Ciebie zaproszenia. 
 \nNie masz uprawnień aby dodawać pokoje.</string>
-    <string name="this_space_has_no_rooms">W tej Przestrzeni nie ma żadnych pokojów</string>
+    <string name="this_space_has_no_rooms">W tej przestrzeni nie ma żadnych pokojów</string>
     <string name="spaces_no_server_support_description">Proszę skontaktować się z administratorem Twojego serwera domowego aby uzyskać więcej informacji</string>
     <string name="spaces_no_server_support_title">Wygląda na to, że Twój serwer domowy jeszcze nie obsługuje Przestrzeni</string>
     <string name="spaces_feeling_experimental_subspace">Lubisz eksperymentować\?
@@ -1975,7 +1982,7 @@
     <string name="space_leave_prompt_msg_private">Nie będziesz w stanie ponownie dołączyć, do momentu kiedy nie zostaniesz ponownie zaproszony.</string>
     <string name="space_leave_prompt_msg_only_you">Jesteś jedyną osoba tutaj. Jeśli wyjdziesz, nikt nie będzie w stanie dołączyć w przyszłości, włączając Ciebie.</string>
     <string name="space_leave_prompt_msg_with_name">Czy jesteś pewny, że chcesz opuścić %s\?</string>
-    <string name="leave_space">Opuść przestrzeń</string>
+    <string name="leave_space">Opuść</string>
     <string name="space_add_child_title">Dodawaj pokoje</string>
     <string name="space_explore_activity_title">Przeglądaj pokoje</string>
     <string name="finish_setup">Ukończ konfigurację</string>
@@ -1985,7 +1992,7 @@
 \nSpróbuj ponownie później lub zapytaj administratora tego pokoju czy masz dostęp.</string>
     <string name="join_anyway">Dołącz pomimo to</string>
     <string name="join_space">Dołącz do przestrzeni</string>
-    <string name="create_space">Stwórz przestrzeń</string>
+    <string name="create_space">Utwórz przestrzeń</string>
     <string name="skip_for_now">Na razie pomiń</string>
     <string name="share_space_link_message">Dołącz do mojej przestrzeni %1$s %2$s</string>
     <string name="invite_just_to_this_room_desc">Nie będą częścią %s</string>
@@ -2016,7 +2023,7 @@
     <string name="create_spaces_me_and_teammates">Ja i moi znajomi</string>
     <string name="create_spaces_organise_rooms">Prywatna przestrzeń do organizacji Twoich pokojów</string>
     <string name="create_spaces_just_me">Tylko ja</string>
-    <string name="create_spaces_make_sure_access">Upewnij się, że odpowiednie osoby mają dostęp do %s. Możesz zmienić to później.</string>
+    <string name="create_spaces_make_sure_access">Upewnij się, że odpowiednie osoby mają dostęp do %s.</string>
     <string name="create_spaces_who_are_you_working_with">Z kim pracujesz\?</string>
     <string name="create_spaces_join_info_help">Aby dołączyć do istniejącej przestrzeni, potrzebujesz zaproszenia.</string>
     <string name="create_spaces_you_can_change_later">Możesz zmienić to później</string>
@@ -2028,10 +2035,10 @@
 \nCzekanie na odpowiedź serwera…</string>
     <string name="room_displayname_empty_room_was">Pusty pokój (było %s)</string>
     <plurals name="room_displayname_four_and_more_members">
-        <item quantity="one">%1$s, %2$s, %3$s i %4$d innych</item>
+        <item quantity="one">%1$s, %2$s, %3$s i %4$d inny</item>
         <item quantity="few">%1$s, %2$s, %3$s i %4$d innych</item>
-        <item quantity="many"/>
-        <item quantity="other"/>
+        <item quantity="many">%1$s, %2$s, %3$s i %4$d innych</item>
+        <item quantity="other">%1$s, %2$s, %3$s i %4$d innych</item>
     </plurals>
     <string name="room_displayname_4_members">%1$s, %2$s, %3$s i %4$s</string>
     <string name="power_level_custom_no_value">Niestandardowe</string>
@@ -2105,7 +2112,7 @@
     <string name="decide_who_can_find_and_join">Zdecyduj kto może odnaleźć i dołączyć do tego pokoju.</string>
     <string name="tap_to_edit_spaces">Dotknij, aby edytować przestrzenie</string>
     <string name="select_spaces">Wybierz przestrzenie</string>
-    <string name="decide_which_spaces_can_access">Zdecyduj które przestrzenie mogą mieć dostęp do tego pokoju. Członkowie wybranej przestrzeni będą mogli ją odnaleźć i dołączyć do Pokoju przez nazwę.</string>
+    <string name="decide_which_spaces_can_access">Zdecyduj, które przestrzenie mogą mieć dostęp do tego pokoju. Członkowie zaznaczonej przestrzeni będą mogli odnaleźć i dołączyć do nazwy pokoju.</string>
     <string name="spaces_which_can_access">Przestrzenie mogące uzyskać dostęp</string>
     <string name="allow_space_member_to_find_and_access">Zezwól użytkownikom przestrzeni na znalezienie i dostęp.</string>
     <string name="settings_room_upgrades">Ulepszenia pokoju</string>
@@ -2208,7 +2215,7 @@
         <item quantity="other">Dodano %1$s jako adresy dla tego pokoju.</item>
     </plurals>
     <string name="login_social_sso">pojedyncze logowanie</string>
-    <string name="shortcut_disabled_reason_room_left">Pokój opuszczony!</string>
+    <string name="shortcut_disabled_reason_room_left">Pokój został opuszczony!</string>
     <string name="call_dial_pad_lookup_error">Błąd podczas wyszukiwania numeru telefonu</string>
     <string name="call_transfer_title">Przekaż</string>
     <string name="call_tap_to_return">%1$s dotknij by powrócić</string>
@@ -2328,10 +2335,234 @@
     <string name="preference_help_summary">Uzyskaj pomoc w korzystaniu z ${app_name}</string>
     <string name="room_error_access_unauthorized">Nie masz uprawnień by dołączyć do tego pokoju</string>
     <string name="dev_tools_form_hint_type">Typ</string>
-    <string name="a11y_presence_offline">Niedostępny</string>
-    <string name="a11y_presence_online">Dostępny</string>
-    <string name="a11y_view_read_receipts">Pokaż znaczniki odczytania</string>
+    <string name="a11y_presence_offline">Offline</string>
+    <string name="a11y_presence_online">Online</string>
+    <string name="a11y_view_read_receipts">Wyświetl znaczniki odczytania</string>
     <string name="discovery_section">Odkrywanie (%s)</string>
     <string name="finish_setting_up_discovery">Dokończ konfigurację odkrywania.</string>
     <string name="event_status_a11y_delete_all">Usuń wszystkie nieudane wiadomości</string>
+    <string name="bootstrap_migration_with_passphrase_helper_with_link">Nie znasz hasła swojego zapasowego klucza\? Możesz %s.</string>
+    <plurals name="entries">
+        <item quantity="one">%d wpis</item>
+        <item quantity="few">%d wpisy</item>
+        <item quantity="many">%d wpisów</item>
+        <item quantity="other">%d wpisów</item>
+    </plurals>
+    <plurals name="space_people_you_know">
+        <item quantity="one">%d osoba, którą znasz, już dołączyła</item>
+        <item quantity="few">%d osoby, które znasz, już dołączyły</item>
+        <item quantity="many">%d osób, które znasz, już dołączyły</item>
+        <item quantity="other">%d osób, które znasz, już dołączyły</item>
+    </plurals>
+    <string name="dev_tools_error_no_message_type">Brakujący typ wiadomości</string>
+    <string name="dev_tools_error_no_content">Brak zawartości</string>
+    <string name="dev_tools_send_custom_event">Wyślij zdarzenie niestandardowe</string>
+    <string name="a11y_trust_level_warning">Ostrzegawczy poziom zaufania</string>
+    <string name="call_transfer_consult_first">Upewnij się najpierw</string>
+    <string name="a11y_unchecked">Nie sprawdzono</string>
+    <string name="a11y_checked">Sprawdzono</string>
+    <string name="restart_the_application_to_apply_changes">Aby zmiany zostały zastosowane, należy uruchomić ponownie aplikację.</string>
+    <string name="labs_enable_latex_maths">Włącz matematykę LaTeX</string>
+    <string name="poll_end_action">Zakończ ankietę</string>
+    <string name="end_poll_confirmation_title">Czy zakończyć ankietę\?</string>
+    <string name="end_poll_confirmation_description">To powstrzyma użytkowników od głosowania i wyświetli ostateczny wynik ankiety.</string>
+    <string name="labs_enable_thread_messages_desc">Uwaga: aplikacja zostanie uruchomiona ponownie</string>
+    <string name="labs_enable_thread_messages">Włącz wątkowanie wiadomości</string>
+    <string name="create_spaces_invite_public_header_desc">Upewnij się, że odpowiednie osoby mają dostęp do firmy %s. Więcej osób możesz zaprosić później.</string>
+    <string name="dev_tools_send_custom_state_event">Wyślij niestandardowe zdarzenie stanowe</string>
+    <string name="dev_tools_send_state_event">Wyślij zdarzenie stanowe</string>
+    <string name="dev_tools_state_event">Zdarzenia stanowe</string>
+    <string name="dev_tools_event_content_hint">Zawartość zdarzenia</string>
+    <string name="dev_tools_success_state_event">Zdarzenie stanowe wysłane!</string>
+    <string name="dev_tools_success_event">Zdarzenie wysłane!</string>
+    <string name="dev_tools_error_malformed_event">Nieprawidłowe zdarzenie</string>
+    <string name="dev_tools_form_hint_event_content">Zawartość wydarzenia</string>
+    <string name="dev_tools_form_hint_state_key">Klucz stanu</string>
+    <string name="call_transfer_consulting_with">Konsultacja z %1$s</string>
+    <string name="error_forbidden_digits_only_username">Serwer domowy nie akceptuje nazwy użytkownika zawierającej tylko cyfry.</string>
+    <string name="command_description_discard_session">Wymusza odrzucenie bieżącej sesji grupy wychodzącej w zaszyfrowanym pokoju</string>
+    <string name="bootstrap_progress_compute_curve_key">Pobieranie krzywego klucza</string>
+    <string name="encryption_misconfigured">Szyfrowanie jest błędnie skonfigurowane</string>
+    <string name="room_profile_section_restore_security">Przywróć szyfrowanie</string>
+    <string name="contact_admin_to_restore_encryption">Skontaktuj się z administratorem, aby przywrócić szyfrowanie do prawidłowego stanu.</string>
+    <string name="encryption_has_been_misconfigured">Szyfrowanie zostało błędnie skonfigurowane.</string>
+    <string name="login_splash_create_account">Utwórz konto</string>
+    <string name="ftue_personalize_skip_this_step">Pomiń ten krok</string>
+    <string name="ftue_personalize_submit">Zapisz i kontynuuj</string>
+    <string name="ftue_personalize_complete_subtitle">Twoje ustawienia zostały zapisane.</string>
+    <string name="ftue_personalize_complete_title">Wszystko ustawiłeś!</string>
+    <string name="ftue_personalize_lets_go">Chodźmy</string>
+    <string name="ftue_profile_picture_subtitle">Możesz go zmienić w każdym momencie.</string>
+    <string name="ftue_profile_picture_title">Dodaj obraz profilu</string>
+    <string name="ftue_display_name_entry_footer">Możesz zmienić ją później</string>
+    <string name="room_message_autocomplete_notification">Powiadomienie pokoju</string>
+    <string name="ftue_display_name_entry_title">Wyświetlana nazwa</string>
+    <string name="ftue_display_name_subtitle">Będzie ona widoczna podczas wysyłania wiadomości.</string>
+    <string name="ftue_display_name_title">Wybierz wyświetlaną nazwę</string>
+    <string name="ftue_account_created_subtitle">Twoje konto %s zostało utworzone.</string>
+    <string name="ftue_account_created_congratulations_title">Gratulacje!</string>
+    <string name="ftue_account_created_take_me_home">Zabierz mnie do domu</string>
+    <string name="ftue_account_created_personalize">Spersonalizuj profil</string>
+    <string name="ftue_auth_use_case_connect_to_server">Połącz się z serwerem</string>
+    <string name="ftue_auth_use_case_join_existing_server">Chcesz dołączyć do istniejącego serwera\?</string>
+    <string name="ftue_auth_use_case_skip_partial">pominąć to pytanie</string>
+    <string name="ftue_auth_use_case_skip">Nie wiesz jeszcze\? Możesz %s</string>
+    <string name="ftue_auth_use_case_option_three">Społeczności</string>
+    <string name="ftue_auth_use_case_option_two">Zespoły</string>
+    <string name="ftue_auth_use_case_option_one">Przyjaciele i rodzina</string>
+    <string name="ftue_auth_use_case_subtitle">Pomożemy Ci się połączyć.</string>
+    <string name="ftue_auth_use_case_title">Z kim będziesz najczęściej rozmawiać\?</string>
+    <string name="ftue_auth_carousel_encrypted_body">Szyfrowane od-końca-do-końca i nie wymaga numeru telefonu. Brak reklam i dataminingu.</string>
+    <string name="ftue_auth_carousel_control_body">Wybierz, gdzie prowadzone są Twoje rozmowy, dając Ci kontrolę i niezależność. Połączenie przez sieć Matrix.</string>
+    <string name="ftue_auth_carousel_secure_body">Bezpieczna i niezależna komunikacja, która zapewnia ten sam poziom prywatności, co rozmowa twarzą w twarz we własnym domu.</string>
+    <string name="ftue_auth_carousel_workplace_title">Wiadomości dla Twojego zespołu.</string>
+    <string name="attachment_type_location">Położenie</string>
+    <string name="preference_root_legals">Zagadnienia prawne</string>
+    <string name="navigate_to_thread_when_already_in_the_thread">Już przeglądasz ten wątek!</string>
+    <string name="view_in_room">Wyświetl w pokoju</string>
+    <string name="reply_in_thread">Odpowiedz w wątku</string>
+    <string name="command_not_supported_in_threads">Polecenie „%s” jest rozpoznawane, ale nie jest obsługiwane w wątkach.</string>
+    <string name="legals_no_policy_provided">Ten serwer nie zapewnia żadnych zasad.</string>
+    <string name="legals_identity_server_title">Polityka Twojego serwera tożsamości</string>
+    <string name="legals_home_server_title">Polityka Twojego serwera domowego</string>
+    <string name="legals_application_title">Polityka ${app_name}</string>
+    <string name="threads_notice_migration_title">Wątki zbliżają się do wersji beta 🎉</string>
+    <string name="search_thread_from_a_thread">Z wątku</string>
+    <string name="thread_list_empty_notice">Wskazówka: naciśnij i przytrzymaj wiadomość i użyj „%s”.</string>
+    <string name="thread_list_empty_subtitle">Dzięki wątkom Twoje rozmowy są aktualne i łatwe do śledzenia.</string>
+    <string name="thread_list_empty_title">Organizuj dyskusje za pomocą wątków</string>
+    <string name="thread_list_modal_my_threads_subtitle">Pokazuje wszystkie wątki, w których brałeś udział</string>
+    <string name="thread_list_modal_all_threads_subtitle">Pokazuje wszystkie wątki z bieżącego pokoju</string>
+    <string name="thread_list_modal_my_threads_title">Moje wątki</string>
+    <string name="thread_list_modal_all_threads_title">Wszystkie wątki</string>
+    <string name="thread_list_modal_title">Filtr</string>
+    <string name="thread_list_title">Wątki</string>
+    <string name="thread_timeline_title">Wątek</string>
+    <string name="room_threads_filter">Filtruj wątki w pokoju</string>
+    <string name="room_unsupported_e2e_algorithm_as_admin">Szyfrowanie zostało źle skonfigurowane, więc nie możesz wysyłać wiadomości. Kliknij, aby otworzyć ustawienia.</string>
+    <string name="room_unsupported_e2e_algorithm">Szyfrowanie zostało źle skonfigurowane, więc nie możesz wysyłać wiadomości. Skontaktuj się z administratorem, aby przywrócić szyfrowanie do prawidłowego stanu.</string>
+    <string name="room_notification_more_than_two_users_are_typing">%1$s, %2$s i inni</string>
+    <string name="room_notification_two_users_are_typing">%1$s i %2$s</string>
+    <string name="action_thread_copy_link_to_thread">Skopiuj odnośnik do wątku</string>
+    <string name="action_thread_view_in_room">Zobacz w pokoju</string>
+    <string name="action_disable">Wyłącz</string>
+    <string name="action_view_threads">Wyświetl wątki</string>
+    <string name="tooltip_attachment_poll">Utwórz ankietę</string>
+    <string name="tooltip_attachment_contact">Otwórz kontakty</string>
+    <string name="tooltip_attachment_sticker">Wyślij naklejkę</string>
+    <string name="tooltip_attachment_file">Prześlij plik</string>
+    <string name="tooltip_attachment_gallery">Wyślij obrazy oraz wideo</string>
+    <string name="tooltip_attachment_photo">Otwórz kamerę</string>
+    <string name="delete_poll_dialog_title">Usuń ankietę</string>
+    <string name="poll_end_room_list_preview">Ankieta zakończona</string>
+    <string name="poll_response_room_list_preview">Oddano głos</string>
+    <string name="end_poll_confirmation_approve_button">Zakończ ankietę</string>
+    <plurals name="message_reaction_show_more">
+        <item quantity="one">I jeszcze %1$d</item>
+        <item quantity="few">I jeszcze %1$d</item>
+        <item quantity="many">I jeszcze %1$d</item>
+        <item quantity="other">I jeszcze %1$d</item>
+    </plurals>
+    <plurals name="poll_total_vote_count_after_ended">
+        <item quantity="one">Wynik końcowy na podstawie %1$d głosu</item>
+        <item quantity="few">Wynik końcowy na podstawie %1$d głosów</item>
+        <item quantity="many">Wynik końcowy na podstawie %1$d głosów</item>
+        <item quantity="other">Wynik końcowy na podstawie %1$d głosów</item>
+    </plurals>
+    <plurals name="poll_total_vote_count_before_ended_and_not_voted">
+        <item quantity="one">Oddano %1$d głos. Głosuj, aby zobaczyć wyniki</item>
+        <item quantity="few">Oddano %1$d głosy. Głosuj, aby zobaczyć wyniki</item>
+        <item quantity="many">Oddano %1$d głosów. Głosuj, aby zobaczyć wyniki</item>
+        <item quantity="other">Oddano %1$d głosów. Głosuj, aby zobaczyć wyniki</item>
+    </plurals>
+    <plurals name="poll_total_vote_count_before_ended_and_voted">
+        <item quantity="one">W oparciu o %1$d głos</item>
+        <item quantity="few">W oparciu o %1$d głosy</item>
+        <item quantity="many">W oparciu o %1$d głosów</item>
+        <item quantity="other">W oparciu o %1$d głosów</item>
+    </plurals>
+    <plurals name="poll_option_vote_count">
+        <item quantity="one">%1$d głos</item>
+        <item quantity="few">%1$d głosy</item>
+        <item quantity="many">%1$d głosów</item>
+        <item quantity="other">%1$d głosów</item>
+    </plurals>
+    <plurals name="create_poll_not_enough_options_error">
+        <item quantity="one">Wymagana jest co najmniej %1$s opcja</item>
+        <item quantity="few">Wymagane są co najmniej %1$s opcje</item>
+        <item quantity="many">Wymaganych jest co najmniej %1$s opcji</item>
+        <item quantity="other">Wymaganych jest co najmniej %1$s opcji</item>
+    </plurals>
+    <string name="threads_notice_migration_message">Zbliżamy się do udostępnienia publicznej wersji beta dla wątków.
+\n
+\nPrzygotowując się do tego, musimy wprowadzić pewne zmiany: wątki utworzone przed tym punktem będą wyświetlane jako zwykłe odpowiedzi.
+\n
+\nBędzie to jednorazowe przejście, ponieważ wątki są teraz częścią specyfikacji Matrix.</string>
+    <plurals name="notice_room_server_acl_changes">
+        <item quantity="one">%d zmieniony ACL serwera</item>
+        <item quantity="few">%d zmienione ACL serwera</item>
+        <item quantity="many">%d zmienionych ACL serwera</item>
+        <item quantity="other">%d zmienionych ACL serwera</item>
+    </plurals>
+    <string name="message_reaction_show_less">Pokaż mniej</string>
+    <string name="tooltip_attachment_location">Udostępnij lokalizację</string>
+    <string name="message_bubbles">Pokaż dymki wiadomości</string>
+    <string name="live_location_sharing_notification_description">Trwa udostępnianie lokalizacji</string>
+    <string name="live_location_sharing_notification_title">Lokalizacja na żywo ${app_name}</string>
+    <string name="location_share_live_stop">Zatrzymaj</string>
+    <string name="location_share_live_enabled">Włączona lokalizacja na żywo</string>
+    <string name="location_timeline_failed_to_load_map">Nie udało się wczytać mapy</string>
+    <string name="labs_render_locations_in_timeline">Renderuj lokalizacje użytkowników na osi czasu</string>
+    <string name="settings_enable_location_sharing_summary">Po włączeniu będziesz mógł wysłać swoją lokalizację do dowolnego pokoju</string>
+    <string name="settings_enable_location_sharing">Włącz udostępnianie lokalizacji</string>
+    <string name="location_share_external">Otwórz za pomocą</string>
+    <string name="location_not_available_dialog_content">${app_name} nie może uzyskać dostępu do Twojej lokalizacji. Spróbuj ponownie później.</string>
+    <string name="location_not_available_dialog_title">${app_name} nie może uzyskać dostępu do Twojej lokalizacji</string>
+    <string name="location_in_background_missing_permission_dialog_content">Jeśli chcesz udostępniać swoją lokalizację na żywo, ${app_name} potrzebuje dostępu do lokalizacji przez cały czas, gdy aplikacja działa w tle.
+\n Będziemy mieć dostęp do Twojej lokalizacji tylko przez wybrany przez Ciebie okres.</string>
+    <string name="location_in_background_missing_permission_dialog_title">Zgoda na dostęp</string>
+    <string name="a11y_location_share_option_pinned_icon">Udostępnij tę lokalizację</string>
+    <string name="location_share_option_pinned">Udostępnij tę lokalizację</string>
+    <string name="a11y_location_share_option_user_live_icon">Udostępnij lokalizację na żywo</string>
+    <string name="location_share_option_user_live">Udostępnij lokalizację na żywo</string>
+    <string name="a11y_location_share_option_user_current_icon">Udostępnij moją aktualną lokalizację</string>
+    <string name="location_share_option_user_current">Udostępnij moją aktualną lokalizację</string>
+    <string name="a11y_location_share_locate_button">Powiększ do bieżącej lokalizacji</string>
+    <string name="a11y_location_share_pin_on_map">Przypnij na mapie wybraną lokalizację</string>
+    <string name="location_share" tools:ignore="UnusedResources">Udostępnij lokalizację</string>
+    <string name="a11y_static_map_image">Mapa</string>
+    <string name="a11y_location_share_icon" tools:ignore="UnusedResources">Udostępnij lokalizację</string>
+    <string name="location_activity_title_preview">Lokalizacja</string>
+    <string name="location_activity_title_static_sharing">Udostępnij lokalizację</string>
+    <string name="closed_poll_option_description">Wyniki są ujawniane dopiero po zakończeniu ankiety</string>
+    <string name="closed_poll_option_title">Ankieta zamknięta</string>
+    <string name="open_poll_option_description">Głosujący widzą wyniki zaraz po oddaniu głosu</string>
+    <string name="open_poll_option_title">Otwarta ankieta</string>
+    <string name="poll_type_title">Rodzaj ankiety</string>
+    <string name="edit_poll_title">Modyfikacja ankiety</string>
+    <string name="a11y_poll_winner_option">opcja zwyciężająca</string>
+    <string name="poll_no_votes_cast">Brak głosów</string>
+    <string name="this_invite_to_this_space_was_sent">Zaproszenie do tej przestrzeni zostało wysłane do %s, które nie jest powiązane z Twoim kontem</string>
+    <string name="this_invite_to_this_room_was_sent">Zaproszenie do tego pokoju zostało wysłane do %s, które nie jest powiązane z Twoim kontem</string>
+    <string name="upgrade_room_for_restricted_no_param">Każdy w przestrzeni nadrzędnej będzie mógł znaleźć ten pokój i dołączyć do niego — nie ma potrzeby ręcznego zapraszania wszystkich. W każdej chwili możesz to zmienić w ustawieniach pokoju.</string>
+    <string name="upgrade_room_update_parent_space">Automatycznie aktualizuj nadrzędną przestrzeń</string>
+    <string name="labs_auto_report_uisi_desc">Twój system automatycznie wyśle dzienniki, gdy wystąpi błąd niemożności odszyfrowania</string>
+    <string name="labs_auto_report_uisi">Błędy automatycznego deszyfrowania raportów.</string>
+    <string name="command_description_leave_room">Opuść pokój o podanym identyfikatorze (lub aktualny pokój, jeśli null)</string>
+    <string name="sent_location">Udostępnili swoją lokalizację</string>
+    <string name="room_message_notify_everyone">Powiadom cały pokój</string>
+    <string name="room_message_autocomplete_users">Użytkownicy</string>
+    <string name="beta">BETA</string>
+    <string name="send_feedback_threads_title">Opinia o wątkach</string>
+    <string name="give_feedback_threads">Przekaż opinię</string>
+    <string name="beta_title_bottom_sheet_action">BETA</string>
+    <string name="settings_presence_user_always_appears_offline_summary">Jeśli włączone, inni zobaczą twój status jako offline, nawet gdy używasz aplikacji.</string>
+    <string name="settings_presence_user_always_appears_offline">Tryb offline</string>
+    <string name="settings_presence">Statusy</string>
+    <string name="threads_labs_enable_notice_message">Twój serwer nie obsługuje obecnie wątków, co może powodować niestabilność tej funkcji. Niektóre wiadomości w wątkach mogą nie być poprawnie widoczne. %sCzy chcesz je włączyć pomimo tego\?</string>
+    <string name="threads_labs_enable_notice_title">Wątki (Beta)</string>
+    <string name="threads_beta_enable_notice_message">Dzięki wątkom Twoje rozmowy są zorganizowane i łatwe do śledzenia. %sWłączenie wątków uruchomi ponownie aplikację. Może to zająć więcej czasu dla niektórych kont.</string>
+    <string name="threads_beta_enable_notice_title">Wątki (Beta)</string>
+    <string name="action_learn_more">Dowiedz się więcej</string>
+    <string name="action_try_it_out">Wypróbuj</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index d06937fb64..21ea05a47c 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -757,7 +757,9 @@
 \n
 \nVocê pode reverter esta ação a qualquer momento nas configurações gerais.</string>
     <string name="room_participants_action_unignore_title">Designorar usuária(o)</string>
-    <string name="room_participants_action_unignore_prompt_msg">Designorar esta(e) usuária(o) vai mostrar todas as mensagens dela(e) de novo.</string>
+    <string name="room_participants_action_unignore_prompt_msg">Designorar esta(e) usuária(o) vai mostrar todas as mensagens dela(e) de novo.
+\n
+\nNote que esta ação vai recomeçar o app e pode levar algum tempo.</string>
     <string name="room_participants_action_cancel_invite_title">Cancelar convite</string>
     <string name="room_participants_action_cancel_invite_prompt_msg">Você tem certeza que você quer cancelar o convite para esta(e) usuária(o)\?</string>
     <string name="room_participants_remove_title">Expulsar usuária(o)</string>
@@ -1953,11 +1955,11 @@
         <item quantity="other">%d entradas</item>
     </plurals>
     <string name="settings_server_upload_size_title">Limite de upload de arquivo do servidor</string>
-    <string name="room_settings_room_access_restricted_description">Qualquer pessoa num espaço com esta sala pode encontrá-la e juntar-se a ela. Somente admins desta sala podem adicioná-la a um espaço.</string>
+    <string name="room_settings_room_access_restricted_description">Qualquer pessoa num espaço com esta sala pode achá-la e se juntar a ela. Somente admins desta sala podem adicioná-la a um espaço.</string>
     <string name="room_settings_room_access_restricted_title">Membros de espaço somente</string>
-    <string name="room_settings_room_access_public_description">Qualquer pessoa pode encontrar a sala e juntar-se</string>
+    <string name="room_settings_room_access_public_description">Qualquer pessoa pode achar a sala e se juntar</string>
     <string name="room_settings_room_access_public_title">Pública</string>
-    <string name="room_settings_room_access_private_description">Somente pessoas convidadas podem encontrar e juntar-se</string>
+    <string name="room_settings_room_access_private_description">Somente pessoas convidadas podem achar e se juntar</string>
     <string name="room_settings_room_access_private_title">Privada</string>
     <string name="room_settings_room_access_entry_unknown">Configuração de acesso desconhecida (%s)</string>
     <string name="room_settings_room_access_entry_knock">Qualquer pessoa pode tocar na sala, membros podem então aceitar ou rejeitar</string>
@@ -2024,7 +2026,7 @@
         <item quantity="other">%d pessoas que você conhece já têm se juntado</item>
     </plurals>
     <string name="join_space">Juntar-Se a Espaço</string>
-    <string name="create_space">Criar Espaço</string>
+    <string name="create_space">Criar espaço</string>
     <string name="share_space_link_message">Junte-se a meu espaço %1$s %2$s</string>
     <string name="invite_to_space_with_name_desc">Elas vão ser capazes de explorar %s</string>
     <string name="invite_to_space_with_name">Convidar para %s</string>
@@ -2058,7 +2060,7 @@
     <string name="create_spaces_choose_type_label">Que tipo de espaço você quer criar\?</string>
     <string name="your_private_space">Seu espaço privado</string>
     <string name="your_public_space">Seu espaço público</string>
-    <string name="add_space">Adicionar Espaço</string>
+    <string name="add_space">Adicionar espaço</string>
     <string name="private_space">Espaço privado</string>
     <string name="public_space">Espaço público</string>
     <string name="command_description_create_space">Criar um Espaço</string>
@@ -2110,9 +2112,9 @@
         <item quantity="one">Chamada de áudio perdida</item>
         <item quantity="other">%d chamadas de áudio perdidas</item>
     </plurals>
-    <string name="upgrade_room_for_restricted_note">Por favor note que fazer upgrade vai fazer uma nova versão da sala. Todas as mensagens atuais vão permanecer nesta sala arquivada.</string>
-    <string name="upgrade_room_for_restricted_no_param">Qualquer pessoa em um espaço pai vai ser capaz de encontrar e juntar-se a esta sala - não precisa convidar manualmente todo mundo. Você vai ser capaz de mudar isto em configurações de sala a qualquer hora.</string>
-    <string name="upgrade_room_for_restricted">Qualquer pessoa em %s vai ser capaz de encontrar e juntar-se a esta sala - não precisa convidar todo mundo. Você vai ser capaz de mudar isto em configurações de sala a qualquer hora.</string>
+    <string name="upgrade_room_for_restricted_note">Por favor note que fazer upgrade vai fazer uma nova versão da sala. Todas as mensagens atuais vão ficar nesta sala arquivada.</string>
+    <string name="upgrade_room_for_restricted_no_param">Qualquer pessoa em um espaço pai vai ser capaz de achar e se juntar a esta sala - não precisa manualmente convidar todo mundo. Você vai ser capaz de mudar isto em configurações de sala a qualquer hora.</string>
+    <string name="upgrade_room_for_restricted">Qualquer pessoa em %s vai ser capaz de achar e se juntar a esta sala - não precisa manualmente convidar todo mundo. Você vai ser capaz de mudar isto em configurações de sala a qualquer hora.</string>
     <string name="voice_message_reply_content">Mensagem de Voz (%1$s)</string>
     <string name="error_voice_message_cannot_reply_or_edit">Não dá para responder ou editar enquanto mensagem de voz está ativa</string>
     <string name="error_voice_message_unable_to_record">Não dá para gravar uma mensagem de voz</string>
@@ -2130,13 +2132,13 @@
     <string name="sent_a_voice_message">Voz</string>
     <string name="other_spaces_or_rooms_you_might_not_know">Outros espaços ou salas que você poderia não saber</string>
     <string name="space_you_know_that_contains_this_room">Espaço que você sabe que contém esta sala</string>
-    <string name="decide_who_can_find_and_join">Decida quem pode encontrar e juntar-se a esta sala.</string>
+    <string name="decide_who_can_find_and_join">Decida quem pode achar e se juntar a esta sala.</string>
     <string name="tap_to_edit_spaces">Toque para editar espaços</string>
     <string name="select_spaces">Selecionar espaços</string>
-    <string name="decide_which_spaces_can_access">Decida que espaços podem acessar esta sala. Se um espaço é selecionado seus membros vão ser capazes de encontrar e juntar-se a Nome de sala.</string>
+    <string name="decide_which_spaces_can_access">Decida que espaços podem acessar esta sala. Se um espaço é selecionado seus membros vão ser capazes de achar e se juntar a Nome de sala.</string>
     <string name="spaces_which_can_access">Espaços que podem acessar</string>
     <string name="allow_space_member_to_find_and_access">Permitir membros de espaço a encontrar e acessar.</string>
-    <string name="room_create_member_of_space_name_can_join">Membros de Escpaço %s podem encontrar, previsualizar e juntar-se.</string>
+    <string name="room_create_member_of_space_name_can_join">Membros de Espaço %s podem achar, previsualizar e se juntar.</string>
     <string name="room_settings_room_access_private_invite_only_title">Privada (Convite Somente)</string>
     <string name="denied_permission_voice_message">Para enviar mensagens de voz, por favor conceda a permissão Microfone.</string>
     <string name="settings_notification_notify_me_for">Notifique-me para</string>
@@ -2222,7 +2224,7 @@
     <string name="open_discovery_settings">Abrir Configurações de Descoberta</string>
     <string name="user_directory_search_hint_2">Pesquisar por nome, ID ou mail</string>
     <string name="create_new_space">Criar Novo Espaço</string>
-    <string name="room_settings_space_access_public_description">Qualquer pessoa pode encontrar o espaço e se juntar</string>
+    <string name="room_settings_space_access_public_description">Qualquer pessoa pode achar o espaço e se juntar</string>
     <string name="room_settings_space_access_title">Acesso a espaço</string>
     <string name="room_settings_access_rules_pref_dialog_title">Quem pode acessar\?</string>
     <string name="settings_notification_emails_enable_for_email">Habilitar notificações de email para %s</string>
@@ -2388,11 +2390,11 @@
     <string name="ftue_auth_use_case_title">Com quem você vai fazer chat mais\?</string>
     <string name="navigate_to_thread_when_already_in_the_thread">Você já está visualizando esta thread!</string>
     <string name="view_in_room">Visualizar Em Sala</string>
-    <string name="reply_in_thread">Responder Em Thread</string>
+    <string name="reply_in_thread">Responder em thread</string>
     <string name="command_not_supported_in_threads">O comando \"%s\" é reconhecido mas não suportado em threads.</string>
     <string name="search_thread_from_a_thread">De uma Thread</string>
     <string name="thread_list_empty_notice">Dica: Toque longo numa mensagem e use “%s”.</string>
-    <string name="thread_list_empty_subtitle">Threads ajudam a manter suas conversas em-tópico e fáceis de rastrear.</string>
+    <string name="thread_list_empty_subtitle">Threads ajudam manter suas conversas em-tópico e fáceis de rastrear.</string>
     <string name="thread_list_empty_title">Mantenha discussões organizadas com threads</string>
     <string name="thread_list_modal_my_threads_subtitle">Mostra todas as threads nas quais você tem participado</string>
     <string name="thread_list_modal_my_threads_title">Minhas Threads</string>
@@ -2438,4 +2440,51 @@
 \n
 \nIsto vai ser uma transição única visto que Threads são agora parte da especificação Matrix.</string>
     <string name="threads_notice_migration_title">Threads Aproximando-Se a Beta 🎉</string>
+    <string name="live_location_sharing_notification_title">${app_name} Localização ao Vivo</string>
+    <string name="live_location_sharing_notification_description">Compartilhamento de localização está em progresso</string>
+    <string name="error_forbidden_digits_only_username">O servidorcasa não aceita nome de usuária(o) com somente dígitos.</string>
+    <string name="ftue_personalize_skip_this_step">Pular este passo</string>
+    <string name="ftue_personalize_submit">Salvar e continuar</string>
+    <string name="ftue_personalize_complete_subtitle">Suas preferências têm sido salvas.</string>
+    <string name="ftue_personalize_complete_title">Você está pronta(o)!</string>
+    <string name="ftue_personalize_lets_go">Vamo lá</string>
+    <string name="ftue_profile_picture_subtitle">Você pode mudar isto a qualquer hora.</string>
+    <string name="ftue_profile_picture_title">Adicione uma imagem de perfil</string>
+    <string name="ftue_display_name_entry_footer">Você pode mudar isto mais tarde</string>
+    <string name="ftue_display_name_entry_title">Nome de Exibição</string>
+    <string name="ftue_display_name_subtitle">Isto vai ser mostrado quando você enviar mensagens.</string>
+    <string name="ftue_display_name_title">Escolha um nome de exibição</string>
+    <string name="ftue_account_created_subtitle">Sua conta %s tem sido criada.</string>
+    <string name="ftue_account_created_congratulations_title">Parabéns!</string>
+    <string name="ftue_account_created_take_me_home">Me leve para casa</string>
+    <string name="ftue_account_created_personalize">Personalizar perfil</string>
+    <string name="action_disable">Desabilitar</string>
+    <string name="location_share_live_started">Carregando localização ao vivo…</string>
+    <string name="location_share_live_select_duration_option_3">8 horas</string>
+    <string name="location_share_live_select_duration_option_2">1 hora</string>
+    <string name="location_share_live_select_duration_option_1">15 minutos</string>
+    <string name="location_share_live_select_duration_title">Compartilhar sua localização ao vivo por</string>
+    <string name="audio_message_file_size">(%1$s)</string>
+    <string name="audio_message_reply_content">%1$s (%2$s)</string>
+    <string name="error_audio_message_unable_to_play">Incapaz de tocar %1$s</string>
+    <string name="a11y_pause_audio_message">Pausar %1$s</string>
+    <string name="a11y_play_audio_message">Tocar %1$s</string>
+    <string name="a11y_audio_playback_duration">%1$d minutos %2$d segundos</string>
+    <string name="a11y_audio_message_item">%1$s, %2$s, %3$s</string>
+    <string name="sent_live_location">Compartilhou a localização ao vivo dela(e)</string>
+    <string name="ftue_auth_carousel_workplace_body">${app_name} também é ótimo para o lugar de trabalho. Ele é confiado pelas organizações mais seguras do mundo.</string>
+    <string name="beta">BETA</string>
+    <string name="send_feedback_threads_info">Threads são um trabalho em progresso com novas funcionalidades próximas emocionantes, tais como notificações melhoradas. Nós adoraríamos ouvir seu feedback!</string>
+    <string name="send_feedback_threads_title">Feedback de Threads Beta</string>
+    <string name="give_feedback_threads">Dar Feedback</string>
+    <string name="beta_title_bottom_sheet_action">BETA</string>
+    <string name="settings_presence_user_always_appears_offline_summary">Se habilitado, você sempre vai aparecer offline para outras(os) usuárias(os), mesmo quando usando o aplicativo.</string>
+    <string name="settings_presence_user_always_appears_offline">Modo offline</string>
+    <string name="settings_presence">Presença</string>
+    <string name="threads_labs_enable_notice_message">Seu servidorcasa não atualmente suporta threads, então esta funcionalidade pode ser inconfiável. Algumas mensagens de thread podem não estar confiavelmente disponíveis. %sVocê quer habilitar threads mesmo assim\?</string>
+    <string name="threads_labs_enable_notice_title">Threads Beta</string>
+    <string name="threads_beta_enable_notice_message">Threads ajudam manThreads ajudam manter suas conversas em-tópico e fáceis de rastrear. %sHabilitar threads vai refrescar o app. Isto pode tomar mais tempo para algumas contas.</string>
+    <string name="threads_beta_enable_notice_title">Threads Beta</string>
+    <string name="action_learn_more">Saber mais</string>
+    <string name="action_try_it_out">Teste aí</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-sk/strings.xml b/vector/src/main/res/values-sk/strings.xml
index bd3e86e40c..a2c1404d2f 100644
--- a/vector/src/main/res/values-sk/strings.xml
+++ b/vector/src/main/res/values-sk/strings.xml
@@ -129,8 +129,8 @@
     <string name="power_level_default">Predvolený</string>
     <string name="power_level_custom">Vlastná úroveň (%1$d)</string>
     <string name="power_level_custom_no_value">Vlastná úroveň</string>
-    <string name="notice_power_level_changed_by_you">Zmenili ste úroveň moci používateľa %1$s.</string>
-    <string name="notice_power_level_changed">%1$s zmenil úroveň moci používateľa %2$s.</string>
+    <string name="notice_power_level_changed_by_you">Zmenili ste úroveň oprávnenia používateľa %1$s.</string>
+    <string name="notice_power_level_changed">%1$s zmenil úroveň oprávnenia používateľa %2$s.</string>
     <string name="notice_power_level_diff">%1$s z %2$s na %3$s</string>
     <string name="notice_room_invite_no_invitee_with_reason_by_you">Pozvanie od vás. Dôvod: %1$s</string>
     <string name="notice_room_invite_with_reason_by_you">Pozvali ste %1$s. Dôvod: %2$s</string>
@@ -284,7 +284,7 @@
     <string name="room_participants_action_ignore">Skryť všetky správy od tohoto používateľa</string>
     <string name="room_participants_action_unignore">Zobraziť všetky správy od tohoto používateľa</string>
     <string name="room_participants_action_mention">Zmieniť sa</string>
-    <string name="room_participants_power_level_prompt">Túto zmenu nebudete môcť vrátiť späť, pretože tomuto používateľovi udeľujete rovnakú úroveň moci, akú máte vy.
+    <string name="room_participants_power_level_prompt">Túto zmenu nebudete môcť vrátiť späť, pretože tomuto používateľovi udeľujete rovnakú úroveň oprávnenia, akú máte vy.
 \nSte si istí\?</string>
     <string name="room_one_user_is_typing">%s píše…</string>
     <string name="room_two_users_are_typing">%1$s a %2$s píšu…</string>
@@ -427,7 +427,7 @@
     <string name="widget_delete_message_confirmation">Ste si istí, že chcete odstrániť widget z tejto miestnosti?</string>
     <string name="widget_integration_unable_to_create">Nie je možné vytvoriť widget.</string>
     <string name="widget_integration_failed_to_send_request">Nepodarilo sa odoslať požiadavku.</string>
-    <string name="widget_integration_positive_power_level">Úroveň moci musí byť kladné celé číslo.</string>
+    <string name="widget_integration_positive_power_level">Úroveň oprávnenia musí byť kladné celé číslo.</string>
     <string name="widget_integration_must_be_in_room">Nenachádzate sa v tejto miestnosti.</string>
     <string name="widget_integration_no_permission_in_room">V tejto miestnosti nemáte oprávnenie na vykonanie takejto akcie.</string>
     <string name="widget_integration_missing_room_id">V požiadavke chýba room_id.</string>
@@ -536,8 +536,8 @@
     <string name="command_description_emote">Zobrazí akciu</string>
     <string name="command_description_ban_user">Zakáže vstup zadanému používateľovi</string>
     <string name="command_description_unban_user">Povolí vstup zadanému používateľovi</string>
-    <string name="command_description_op_user">Určuje úroveň moci pre zadaného používateľa</string>
-    <string name="command_description_deop_user">Znižuje úroveň moci pre zadaného používateľa</string>
+    <string name="command_description_op_user">Určuje úroveň oprávnenia pre zadaného používateľa</string>
+    <string name="command_description_deop_user">Odstráni používateľa s daným ID</string>
     <string name="command_description_invite_user">Pozve zadaného používateľa do aktuálnej miestnosti</string>
     <string name="command_description_join_room">Pripojí sa do miestnosti s danou adresou</string>
     <string name="command_description_part_room">Opustí aktuálnu miestnosť</string>
@@ -667,7 +667,7 @@
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
 \nNa zariadení máte množstvo aplikácií zaregistrovaných na doručovanie okamžitých oznámení cez služby Google play. Konfigurácia ${app_name} nemá vplyv na výskyt tejto chyby. Podľa Google sa môže vyskytovať len pri veľmi vysokom počte nainštalovaných aplikácií. Bežní používatelia by týmto nemali byť postihnutí.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nKonfigurácia ${app_name} nemá vplyv na zobrazenie tejto chyby. Táto chyba sa môže zobraziť z niekoľkých dôvodov. Uistite sa že máte správne nastavený systémový čas a že ste v nastaveniach systému aplikácii služby Google play neobmedzili používanie prístupu na internet. Chyba sa tiež môže zobrazovať na vlastných zostaveniach (ROM), alebo sa chyba môže samovoľne prestať zobrazovať neskôr.</string>
+\nTáto chyba sa vymkla spod kontroly aplikácie ${app_name}. Môže sa vyskytnúť z niekoľkých dôvodov. Možno to bude fungovať, ak to neskôr skúsite znova, môžete tiež skontrolovať, či služba Google Play nemá v systémových nastaveniach obmedzené používanie dát, alebo či sú hodiny vášho zariadenia správne, prípadne sa to môže stať na vlastnej ROM.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
 \nV zariadení nemáte nastavený účet Google. Prosím, pridajte si účet cez správcu účtov. Konfigurácia ${app_name} nemá vplyv na zobrazenie tejto chyby.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Pridať účet</string>
@@ -743,15 +743,17 @@
     <string name="settings_call_show_confirmation_dialog_title">Zabrániť neúmyselnému telefonovaniu</string>
     <string name="settings_call_show_confirmation_dialog_summary">Žiadať potvrdenie pred uskutočnením hovoru</string>
     <string name="room_participants_action_cancel_invite">Zrušiť pozvanie</string>
-    <string name="room_participants_power_level_demote_warning_title">Znížiť vlastnú úroveň moci\?</string>
-    <string name="room_participants_power_level_demote_warning_prompt">Túto zmenu nebudete môcť vrátiť späť, pretože znižujete vašu vlastnú úroveň moci. Ak ste jediný poverený používateľ v miestnosti, nebudete môcť znovu získať úroveň, akú máte teraz.</string>
+    <string name="room_participants_power_level_demote_warning_title">Znížiť vlastnú úroveň oprávnenia\?</string>
+    <string name="room_participants_power_level_demote_warning_prompt">Túto zmenu nebudete môcť vrátiť späť, pretože znižujete vašu vlastnú úroveň oprávnenia. Ak ste jediný poverený používateľ v miestnosti, nebudete môcť znovu získať úroveň, akú máte teraz.</string>
     <string name="room_participants_power_level_demote">Znížiť</string>
     <string name="room_participants_action_ignore_title">Ignorovať používateľa</string>
     <string name="room_participants_action_ignore_prompt_msg">Ignorovaním tohoto používateľa odstránite všetky jeho správy vo vašich spoločných miestnostiach.
 \n
 \nTúto akciu môžete kedykoľvek zmeniť späť vo všeobecných nastaveniach.</string>
     <string name="room_participants_action_unignore_title">Neignorovať používateľa</string>
-    <string name="room_participants_action_unignore_prompt_msg">Zrušením ignorovania si opäť zobrazíte všetky správy od tohoto používateľa.</string>
+    <string name="room_participants_action_unignore_prompt_msg">Zrušením ignorovania tohto používateľa sa opäť zobrazia všetky správy od neho.
+\n
+\nUpozorňujeme, že táto akcia spôsobí reštart aplikácie a môže chvíľu trvať.</string>
     <string name="room_participants_action_cancel_invite_title">Zrušiť pozvanie</string>
     <string name="room_participants_action_cancel_invite_prompt_msg">Ste si istí, že chcete zrušiť pozvanie tohoto používateľa\?</string>
     <string name="room_participants_remove_title">Vykázať používateľa</string>
@@ -900,7 +902,7 @@
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Záloha s %d kľúčom obnovená.</item>
         <item quantity="few">Záloha s %d kľúčmi obnovená.</item>
-        <item quantity="other">Záloha s %d kľúčami obnovená.</item>
+        <item quantity="other">Záloha s %d kľúčmi obnovená.</item>
     </plurals>
     <plurals name="keys_backup_restore_success_description_part2">
         <item quantity="one">%d nový kľúč bol pridaný do tejto relácie.</item>
@@ -1005,7 +1007,7 @@
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Formát:</string>
     <string name="preference_voice_and_video">Zvuk a video</string>
-    <string name="preference_root_help_about">Pomoc a O aplikácii</string>
+    <string name="preference_root_help_about">Pomoc a o aplikácii</string>
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Zaregistrovať token</string>
     <string name="send_suggestion">Poslať návrh</string>
     <string name="send_suggestion_content">Nižšie napíšte obsah návrhu.</string>
@@ -1652,8 +1654,8 @@
     <string name="verification_no_scan_emoji_title">Overiť porovnaním emotikonov</string>
     <string name="verification_scan_self_emoji_subtitle">Namiesto toho overte porovnaním emotikonov</string>
     <string name="verification_scan_emoji_subtitle">Ak nie ste osobne, porovnajte namiesto toho emotikony</string>
-    <string name="verification_scan_with_this_device">Skenovať pomocou tohto zariadenia</string>
-    <string name="verification_scan_self_notice">Naskenujte kód pomocou iného zariadenia alebo prepnite a skenujte pomocou tohto zariadenia</string>
+    <string name="verification_scan_with_this_device">Naskenovať pomocou tohto zariadenia</string>
+    <string name="verification_scan_self_notice">Naskenujte kód pomocou iného zariadenia alebo prepnite a naskenujte pomocou tohto zariadenia</string>
     <string name="verification_scan_notice">Naskenujte kód pomocou zariadenia druhého používateľa, aby ste sa navzájom bezpečne overili</string>
     <string name="sent_verification_conclusion">Záver overovania</string>
     <string name="verification_conclusion_compromised">Môže byť narušená jedna z nasledujúcich vecí:
@@ -2485,4 +2487,51 @@
 \n
 \nPôjde o jednorazový prechod, keďže vlákna sú teraz súčasťou špecifikácie Matrix.</string>
     <string name="threads_notice_migration_title">Vlákna sa blížia k beta verzii 🎉</string>
+    <string name="ftue_account_created_subtitle">Váš účet %s bol vytvorený.</string>
+    <string name="live_location_sharing_notification_description">Prebieha zdieľanie polohy</string>
+    <string name="live_location_sharing_notification_title">${app_name} Poloha v reálnom čase</string>
+    <string name="error_forbidden_digits_only_username">Domovský server neakceptuje používateľské meno obsahujúce iba číslice.</string>
+    <string name="ftue_personalize_skip_this_step">Vynechať tento krok</string>
+    <string name="ftue_personalize_submit">Uložiť a pokračovať</string>
+    <string name="ftue_personalize_complete_subtitle">Vaše nastavenia boli uložené.</string>
+    <string name="ftue_personalize_complete_title">Všetko je pripravené!</string>
+    <string name="ftue_personalize_lets_go">Poďme na to</string>
+    <string name="ftue_profile_picture_subtitle">Toto môžete kedykoľvek zmeniť.</string>
+    <string name="ftue_profile_picture_title">Pridať profilový obrázok</string>
+    <string name="ftue_display_name_entry_footer">Neskôr to môžete zmeniť</string>
+    <string name="ftue_display_name_entry_title">Zobrazované meno</string>
+    <string name="ftue_display_name_subtitle">Toto sa zobrazí pri odosielaní správ.</string>
+    <string name="ftue_display_name_title">Vyberte si zobrazované meno</string>
+    <string name="ftue_account_created_congratulations_title">Gratulujeme!</string>
+    <string name="ftue_account_created_take_me_home">Zober ma domov</string>
+    <string name="ftue_account_created_personalize">Prispôsobiť profil</string>
+    <string name="action_disable">Zakázať</string>
+    <string name="a11y_audio_message_item">%1$s, %2$s, %3$s</string>
+    <string name="settings_presence">Prítomnosť</string>
+    <string name="location_share_live_started">Načítavanie polohy v reálnom čase…</string>
+    <string name="location_share_live_select_duration_title">Zdieľajte svoju polohu v reálnom čase na</string>
+    <string name="location_share_live_select_duration_option_3">8 hodín</string>
+    <string name="location_share_live_select_duration_option_2">1 hodinu</string>
+    <string name="location_share_live_select_duration_option_1">15 minút</string>
+    <string name="audio_message_file_size">(%1$s)</string>
+    <string name="audio_message_reply_content">%1$s (%2$s)</string>
+    <string name="error_audio_message_unable_to_play">Nie je možné prehrať %1$s</string>
+    <string name="a11y_pause_audio_message">Pozastaviť %1$s</string>
+    <string name="a11y_play_audio_message">Prehrať %1$s</string>
+    <string name="a11y_audio_playback_duration">%1$d minút %2$d sekúnd</string>
+    <string name="sent_live_location">Zdieľali svoju polohu v reálnom čase</string>
+    <string name="ftue_auth_carousel_workplace_body">${app_name} je skvelý aj na pracovisku. Dôverujú mu najbezpečnejšie organizácie na svete.</string>
+    <string name="beta">BETA</string>
+    <string name="send_feedback_threads_info">Na vláknach sa neustále pracuje a pripravujú sa nové, zaujímavé funkcie, ako napríklad vylepšené oznámenia. Radi si vypočujeme vašu spätnú väzbu!</string>
+    <string name="send_feedback_threads_title">Spätná väzba na Beta vlákna</string>
+    <string name="give_feedback_threads">Poskytnite spätnú väzbu</string>
+    <string name="beta_title_bottom_sheet_action">BETA</string>
+    <string name="settings_presence_user_always_appears_offline_summary">Ak je táto funkcia zapnutá, budete sa ostatným používateľom vždy javiť ako offline, a to aj pri používaní aplikácie.</string>
+    <string name="settings_presence_user_always_appears_offline">Režim offline</string>
+    <string name="threads_labs_enable_notice_message">Váš domovský server v súčasnosti nepodporuje vlákna, takže táto funkcia môže byť nespoľahlivá. Niektoré správy vo vláknach nemusia byť spoľahlivo dostupné. %sChcete aj tak povoliť vlákna\?</string>
+    <string name="threads_labs_enable_notice_title">Vlákna Beta</string>
+    <string name="threads_beta_enable_notice_message">Vlákna pomáhajú udržiavať vaše konverzácie v téme a ľahké sledovanie. %sZapnutím vlákien sa aplikácia obnoví. V prípade niektorých účtov to môže trvať dlhšie.</string>
+    <string name="threads_beta_enable_notice_title">Vlákna Beta</string>
+    <string name="action_learn_more">Zistiť viac</string>
+    <string name="action_try_it_out">Vyskúšajte si to</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index fb7fb1448e..18d2b137e1 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -1528,7 +1528,9 @@
 \n
 \nKëtë veprim mund ta zhbëni në çfarëdo kohe, te rregullimet e përgjithshme.</string>
     <string name="room_participants_action_unignore_title">Hiqe shpërfilljen e përdoruesit</string>
-    <string name="room_participants_action_unignore_prompt_msg">Heqja e shpërfilljes së këtij përdoruesi do të shfaqë sërish krejt mesazhet prej tij.</string>
+    <string name="room_participants_action_unignore_prompt_msg">Heqja e shpërfilljes së këtij përdoruesi do të shfaqë sërish krejt mesazhet prej tij.
+\n
+\nKini parasysh se ky veprim do të sjellë rinisjen e aplikacionit dhe do të hajë ca kohë.</string>
     <string name="room_participants_action_cancel_invite_title">Anuloje ftesën</string>
     <string name="room_participants_action_cancel_invite_prompt_msg">Jeni i sigurt se doni të anulohet ftesa për këtë përdorues\?</string>
     <string name="room_participants_remove_title">Përzëre përdoruesin</string>
@@ -1957,7 +1959,7 @@
 \nRiprovoni më vonë, ose kërkojini një përgjegjësi dhome të kontrollojë nëse keni leje për hyrje.</string>
     <string name="join_anyway">Hyni, Sido Qoftë</string>
     <string name="join_space">Hyni te Hapësirë</string>
-    <string name="create_space">Krijo Hapësirën</string>
+    <string name="create_space">Krijo hapësirën</string>
     <string name="skip_for_now">Hëpërhë anashkaloje</string>
     <string name="share_space_link_message">Ejani në hapësirën time %1$s %2$s</string>
     <string name="invite_just_to_this_room_desc">S’do të jenë pjesë e %s</string>
@@ -1996,7 +1998,7 @@
     <string name="create_spaces_choose_type_label">Ç’lloj hapësire doni të krijoni\?</string>
     <string name="your_private_space">Hapësira juaj private</string>
     <string name="your_public_space">Hapësira juaj publike</string>
-    <string name="add_space">Shtoni Hapësirë</string>
+    <string name="add_space">Shtoni hapësirë</string>
     <string name="command_description_leave_room">Braktiseni dhomën me ID-në e dhënë (ose dhomën e tanishme, në qoftë nul)</string>
     <string name="command_description_join_space">Hyni te Hapësira me ID-në e dhënë</string>
     <string name="command_description_create_space">Krijoni një Hapësirë</string>
@@ -2376,7 +2378,7 @@
     <string name="ftue_auth_use_case_title">Me kë do të bisedoni më shumë\?</string>
     <string name="navigate_to_thread_when_already_in_the_thread">Po e shihni tashmë këtë rrjedhë!</string>
     <string name="view_in_room">Shiheni në Dhomë</string>
-    <string name="reply_in_thread">Përgjigjuni Te Rrjedha</string>
+    <string name="reply_in_thread">Përgjigjuni te rrjedha</string>
     <string name="command_not_supported_in_threads">Urdhri “%s” njihet, por nuk mbulohet në rrjedha.</string>
     <string name="search_thread_from_a_thread">Nga një Rrjedhë</string>
     <string name="thread_list_empty_notice">Ndihmëz: Prekni pakëz gjatë një mesazh dhe përdorni “%s”.</string>
@@ -2425,4 +2427,50 @@
 \n
 \nKy do të jetë tranzicion vetëm për një herë, meqë tanimë Rrjedhat janë pjesë e protokollit Matrix.</string>
     <string name="threads_notice_migration_title">Rrjedhat Po i Afrohen Beta-s 🎉</string>
+    <string name="live_location_sharing_notification_description">Tregimi i vendndodhjes është në punë e sipër</string>
+    <string name="a11y_location_share_option_user_live_icon">Jepe vendndodhjen “live”</string>
+    <string name="location_share_option_user_live">Jepe vendndodhjen “live”</string>
+    <string name="error_forbidden_digits_only_username">Shërbyesi Home s’pranon emër përdorues vetëm me shifra.</string>
+    <string name="ftue_personalize_skip_this_step">Anashkalojeni këtë hap</string>
+    <string name="ftue_personalize_submit">Ruajeni dhe vazhdoni</string>
+    <string name="ftue_personalize_complete_subtitle">Parapëlqimet tuaja u ruajtën.</string>
+    <string name="ftue_personalize_complete_title">Kaq qe!</string>
+    <string name="ftue_personalize_lets_go">Shkojmë</string>
+    <string name="ftue_profile_picture_subtitle">Këtë mund ta ndryshoni kurdo.</string>
+    <string name="ftue_profile_picture_title">Shtoni një foto profili</string>
+    <string name="ftue_display_name_entry_footer">Këtë mund ta ndryshoni më vonë</string>
+    <string name="ftue_display_name_entry_title">Emër Në Ekran</string>
+    <string name="ftue_display_name_subtitle">Kjo do të shfaqet kur dërgoni mesazhe.</string>
+    <string name="ftue_display_name_title">Zgjidhni një emër për në ekran</string>
+    <string name="ftue_account_created_subtitle">Llogaria juaj %s u krijua.</string>
+    <string name="ftue_account_created_congratulations_title">Përgëzime!</string>
+    <string name="ftue_account_created_take_me_home">Shpjemëni në shtëpi</string>
+    <string name="ftue_account_created_personalize">Personalizoni profil</string>
+    <string name="action_disable">Çaktivizoje</string>
+    <string name="send_feedback_threads_title">Përshtypje për Beta-n e Rrjedhave</string>
+    <string name="settings_presence_user_always_appears_offline_summary">Në u aktivizoftë, përdoruesve të tjerë do t’u dukeni në linjë, madje edhe kur përdoret aplikacioni.</string>
+    <string name="threads_labs_enable_notice_message">Shërbyesi juaj Home aktualisht s’mbulon rrjedha, ndaj kjo veçori mund të jetë e paqëndrueshme. Disa mesazhe rrjedhash mund të mos jenë të përdorshëm. %sDoni të aktivizohen rrjedhat, sido qoftë\?</string>
+    <string name="threads_labs_enable_notice_title">Beta Rrjedhash</string>
+    <string name="threads_beta_enable_notice_message">Rrjedhat ju ndihmojnë t’i mbani bisedat tuaja brenda temës dhe ndjekjen e tyre të lehtë. %sAktivizimi i rrjedhave do të sjellë rifreskimin e aplikacionit. Për disa llogari, kjo mund të zgjasë më shumë.</string>
+    <string name="threads_beta_enable_notice_title">Beta Rrjedhash</string>
+    <string name="send_feedback_threads_info">Rrjedhat janë në përpunim të vazhdueshëm, me veçori të reja, ngazëlluese, të ardhshme, bie fjala, njoftime. Do të donim fort të dëgjonim mendimin tuaj!</string>
+    <string name="location_share_live_select_duration_option_3">8 orë</string>
+    <string name="location_share_live_select_duration_option_2">1 orë</string>
+    <string name="location_share_live_select_duration_option_1">15 minuta</string>
+    <string name="location_share_live_select_duration_title">Tregoni vendndodhjen tuaj drejtpërsëdrejti për</string>
+    <string name="audio_message_file_size">(%1$s)</string>
+    <string name="audio_message_reply_content">%1$s (%2$s)</string>
+    <string name="error_audio_message_unable_to_play">S’arrihet të luhet %1$s</string>
+    <string name="a11y_pause_audio_message">Ndale %1$s</string>
+    <string name="a11y_play_audio_message">Luaje %1$s</string>
+    <string name="a11y_audio_playback_duration">%1$d minuta %2$d sekonda</string>
+    <string name="a11y_audio_message_item">%1$s, %2$s, %3$s</string>
+    <string name="ftue_auth_carousel_workplace_body">${app_name} është gjithashtu i goditur për në punë. Është i besuar nga entet më të sigurta të botës.</string>
+    <string name="beta">BETA</string>
+    <string name="give_feedback_threads">Jepni Përshtypje</string>
+    <string name="beta_title_bottom_sheet_action">BETA</string>
+    <string name="settings_presence_user_always_appears_offline">Mënyra <em>offline</em></string>
+    <string name="settings_presence">Prani</string>
+    <string name="action_learn_more">Mësoni më tepër</string>
+    <string name="action_try_it_out">Provojeni</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index 2b4e3502f8..a7400528fa 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -837,7 +837,9 @@
     <string name="room_participants_power_level_demote">Degradera</string>
     <string name="room_participants_action_ignore_title">Ignorera användare</string>
     <string name="room_participants_action_unignore_title">Avignorera användare</string>
-    <string name="room_participants_action_unignore_prompt_msg">Att avignorera den här användaren kommer att visa alla meddelanden från hen igen.</string>
+    <string name="room_participants_action_unignore_prompt_msg">Att avignorera den här användaren kommer att visa alla meddelanden från denne igen.
+\n
+\nObservera att detta kräver en omstart av appen och kan ta en stund.</string>
     <string name="room_participants_action_cancel_invite_title">Avbryt inbjudan</string>
     <string name="room_participants_action_cancel_invite_prompt_msg">Är du säker på att du vill avbryta inbjudan för den här användaren\?</string>
     <string name="room_participants_remove_title">Kicka användaren</string>
@@ -2421,14 +2423,14 @@
     </plurals>
     <string name="threads_notice_migration_title">Trådar närmar sig beta 🎉</string>
     <string name="location_share_live_stop">Stoppa</string>
-    <string name="location_share_live_enabled">Kontinuerligt plats aktiverad</string>
-    <string name="location_in_background_missing_permission_dialog_content">Om du vill dela din plats kontinuerligt så behöver ${app_name} åtkomst till din plats hela tiden när appen är i bakgrunden.
+    <string name="location_share_live_enabled">Plats i realtid aktiverad</string>
+    <string name="location_in_background_missing_permission_dialog_content">Om du vill dela din plats i realtid så behöver ${app_name} åtkomst till din plats hela tiden när appen är i bakgrunden.
 \nVi kommer bara använda din plats under tiden du väljer.</string>
     <string name="location_in_background_missing_permission_dialog_title">Tillåt åtkomst</string>
     <string name="a11y_location_share_option_pinned_icon">Dela den här platsen</string>
     <string name="location_share_option_pinned">Dela den här platsen</string>
-    <string name="a11y_location_share_option_user_live_icon">Dela plats kontinuerligt</string>
-    <string name="location_share_option_user_live">Dela plats kontinuerligt</string>
+    <string name="a11y_location_share_option_user_live_icon">Dela plats i realtid</string>
+    <string name="location_share_option_user_live">Dela plats i realtid</string>
     <string name="a11y_location_share_option_user_current_icon">Dela min nuvarande plats</string>
     <string name="location_share_option_user_current">Dela min nuvarande plats</string>
     <string name="a11y_location_share_locate_button">Zooma in till nuvarande plats</string>
@@ -2438,4 +2440,51 @@
 \nMedan vi förbereder den så behöver vi göra några ändringar: trådar skapade innan den här tidpunkten kommer att visas som vanliga svar.
 \n
 \nDet kommer att vara en engångshändelse, eftersom trådar nu är en del av Matrixspecifikationen.</string>
+    <string name="live_location_sharing_notification_description">Platsdelning pågår</string>
+    <string name="live_location_sharing_notification_title">${app_name} Realtidsplats</string>
+    <string name="error_forbidden_digits_only_username">Hemservern accepterar inte användarnamn med bara siffror.</string>
+    <string name="ftue_personalize_skip_this_step">Hoppa över det här steget</string>
+    <string name="ftue_personalize_submit">Spara och fortsätt</string>
+    <string name="ftue_personalize_complete_subtitle">Dina inställningar har sparats.</string>
+    <string name="ftue_personalize_complete_title">Du är redo!</string>
+    <string name="ftue_personalize_lets_go">Nu kör vi</string>
+    <string name="ftue_profile_picture_subtitle">Du kan ändra detta när som helst.</string>
+    <string name="ftue_profile_picture_title">Lägg till en profilbild</string>
+    <string name="ftue_display_name_entry_footer">Du kan ändra detta senare</string>
+    <string name="ftue_display_name_entry_title">Visningsnamn</string>
+    <string name="ftue_display_name_subtitle">Det här kommer att visas när du skickar meddelanden.</string>
+    <string name="ftue_display_name_title">Välj ett visningsnamn</string>
+    <string name="ftue_account_created_subtitle">Ditt konto %s har skapats.</string>
+    <string name="ftue_account_created_congratulations_title">Grattis!</string>
+    <string name="ftue_account_created_take_me_home">För mig hem</string>
+    <string name="ftue_account_created_personalize">Anpassa profil</string>
+    <string name="action_disable">Inaktivera</string>
+    <string name="location_share_live_started">Laddar realtidsposition…</string>
+    <string name="location_share_live_select_duration_option_3">8 timmar</string>
+    <string name="location_share_live_select_duration_option_2">1 timme</string>
+    <string name="location_share_live_select_duration_option_1">15 minuter</string>
+    <string name="location_share_live_select_duration_title">Dela din position i realtid under</string>
+    <string name="audio_message_file_size">(%1$s)</string>
+    <string name="audio_message_reply_content">%1$s (%2$s)</string>
+    <string name="error_audio_message_unable_to_play">Kunde inte spela %1$s</string>
+    <string name="a11y_pause_audio_message">Pausa %1$s</string>
+    <string name="a11y_play_audio_message">Spela %1$s</string>
+    <string name="a11y_audio_playback_duration">%1$d minuter och %2$d sekunder</string>
+    <string name="a11y_audio_message_item">%1$s, %2$s, %3$s</string>
+    <string name="sent_live_location">Delade sin position i realtid</string>
+    <string name="ftue_auth_carousel_workplace_body">${app_name} är även perfekt för arbetet. Flera av världens mest säkra organisationer litar på den.</string>
+    <string name="beta">BETA</string>
+    <string name="send_feedback_threads_info">Trådar är under utveckling med nya, spännande funktioner så som förbättrade aviseringar. Kom gärna med återkoppling!</string>
+    <string name="send_feedback_threads_title">Återkoppling för tråd-beta</string>
+    <string name="give_feedback_threads">Ge återkoppling</string>
+    <string name="beta_title_bottom_sheet_action">BETA</string>
+    <string name="settings_presence_user_always_appears_offline_summary">Med detta aktiverat så kommer du alltid se offline ut för andra, även om du är aktiv i appen.</string>
+    <string name="settings_presence_user_always_appears_offline">Offline-läge</string>
+    <string name="settings_presence">Närvaro</string>
+    <string name="threads_labs_enable_notice_message">Din hemserver stödjer för närvarande inte trådar, så denna funktion kanske funkar dåligt. Vissa meddelanden i trådar kanske inte alltid visas. %sVill du ändå aktivera trådar\?</string>
+    <string name="threads_labs_enable_notice_title">Tråd-beta</string>
+    <string name="threads_beta_enable_notice_message">Trådar hjälper till att hålla dina konversationer till ämnet och gör dem lättare att följa. %sFör att aktivera trådar måste appen laddas om. Detta kan ta lång tid för vissa konton.</string>
+    <string name="threads_beta_enable_notice_title">Trådar Beta</string>
+    <string name="action_learn_more">Läs mer</string>
+    <string name="action_try_it_out">Prova</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml
index 26d090e3ef..85900a392e 100644
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -608,8 +608,8 @@
     <string name="video_meeting">Почати відеозустріч</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">У вас немає повноважень розпочати дзвінок</string>
     <string name="no_permissions_to_start_webrtc_call">У вас немає повноважень на дзвінок у цій кімнаті</string>
-    <string name="no_permissions_to_start_conf_call_in_direct_room">У вас немає повноважень розпочати конференц-дзвінок</string>
-    <string name="no_permissions_to_start_conf_call">У вас немає повноважень розпочати конференц-дзвінок у цій кімнаті</string>
+    <string name="no_permissions_to_start_conf_call_in_direct_room">У вас немає повноважень розпочати груповий виклик</string>
+    <string name="no_permissions_to_start_conf_call">У вас немає повноважень розпочати груповий виклик у цій кімнаті</string>
     <string name="action_reset">Скинути</string>
     <string name="action_dismiss">Відхилити</string>
     <string name="action_play">Грати</string>
@@ -816,7 +816,7 @@
     <string name="room_widget_resource_decline_permission">Заблокувати все</string>
     <string name="room_widget_resource_grant_permission">Дозволити</string>
     <string name="room_widget_resource_permission_title">Цей віджет хоче використовувати такі ресурси:</string>
-    <string name="error_jitsi_not_supported_on_old_device">На жаль, конференц-дзвінки з Jitsi не підтримуються на старих пристроях (пристрої з ОС Android нижче 6.0)</string>
+    <string name="error_jitsi_not_supported_on_old_device">На жаль, групові виклики з Jitsi не підтримуються на старих пристроях (пристрої з ОС Android нижче 6.0)</string>
     <string name="room_widget_permission_room_id">ID кімнати</string>
     <string name="room_widget_permission_widget_id">ID віджету</string>
     <string name="room_widget_permission_theme">Ваша тема</string>
@@ -1002,7 +1002,9 @@
     <string name="room_participants_remove_title">Вилучити користувача</string>
     <string name="room_participants_action_cancel_invite_prompt_msg">Ви впевнені, що бажаєте скасувати запрошення для цього користувача\?</string>
     <string name="room_participants_action_cancel_invite_title">Скасувати запрошення</string>
-    <string name="room_participants_action_unignore_prompt_msg">Якщо перестати нехтувати цього користувача, усі його повідомлення стануть знову видимими.</string>
+    <string name="room_participants_action_unignore_prompt_msg">Якщо перестати нехтувати цього користувача, усі його повідомлення стануть знову видимими.
+\n
+\nЗауважте, що ця дія перезапустить застосунок, а це може тривати деякий час.</string>
     <string name="room_participants_action_unignore_title">Рознехтувати користувача</string>
     <string name="room_participants_action_ignore_prompt_msg">Нехтування цього користувача призведе до вилучення його повідомлень з усіх спільних кімнат.
 \n
@@ -1142,7 +1144,7 @@
     <string name="room_list_quick_actions_leave">Вийти з кімнати</string>
     <string name="room_profile_section_more_leave">Вийти з кімнати</string>
     <string name="direct_room_profile_section_more_leave">Вийти</string>
-    <string name="jitsi_leave_conf_to_join_another_one_content">Вийти з поточної конференції та перейти до іншої\?</string>
+    <string name="jitsi_leave_conf_to_join_another_one_content">Вийти з поточного групового виклику та перейти до іншого\?</string>
     <string name="room_participants_leave_private_warning">Це не загальнодоступна кімната. Ви не зможете знову приєднатися без запрошення.</string>
     <string name="room_settings_enable_encryption_no_permission">У вас немає дозволу на ввімкнення шифрування в цій кімнаті.</string>
     <string name="room_settings_permissions_title">Дозволи кімнати</string>
@@ -1461,7 +1463,7 @@
     <string name="keys_backup_restore_with_recovery_key">Використайте ключ відновлення, щоб розблокувати історію зашифрованих повідомлень</string>
     <string name="keys_backup_restore_use_recovery_key">використайте свій ключ відновлення</string>
     <string name="keys_backup_restore_is_getting_backup_version">Отримання резервної версії…</string>
-    <string name="error_jitsi_join_conf">Перепрошуємо, під час спроби приєднатися до конференції сталася помилка</string>
+    <string name="error_jitsi_join_conf">Перепрошуємо, під час спроби приєднатися до групового виклику сталася помилка</string>
     <string name="directory_add_a_new_server_error_already_added">Цей сервер уже є у списку</string>
     <string name="directory_add_a_new_server_error">Не вдалося знайти цей сервер або його список кімнат</string>
     <string name="directory_add_a_new_server_prompt">Введіть назву нового сервера, який потрібно дослідити.</string>
@@ -1490,7 +1492,7 @@
     <string name="room_settings_room_access_entry_unknown">Невідоме налаштування доступу (%s)</string>
     <string name="room_settings_room_access_entry_knock">Будь-хто може попроситися до кімнати, учасники можуть прийняти або відхилити</string>
     <string name="join_anyway">Усе одно приєднатися</string>
-    <string name="create_space">Створити Простір</string>
+    <string name="create_space">Створити простір</string>
     <string name="join_space">Приєднатися до Простору</string>
     <string name="invite_by_link">Поділитися посиланням</string>
     <string name="invite_by_email">Запросити електронним листом</string>
@@ -2530,4 +2532,51 @@
 \n
 \nЦе буде одноразовий перехід, оскільки треди — тепер частина специфікації Matrix.</string>
     <string name="threads_notice_migration_title">Незабаром бета-версія тредів 🎉</string>
+    <string name="live_location_sharing_notification_description">Триває передавання місцеперебування</string>
+    <string name="live_location_sharing_notification_title">${app_name} Місцеперебування наживо</string>
+    <string name="error_forbidden_digits_only_username">Домашній сервер не приймає ім\'я користувача лише з цифр.</string>
+    <string name="ftue_personalize_skip_this_step">Пропустити цей крок</string>
+    <string name="ftue_personalize_submit">Зберегти й продовжити</string>
+    <string name="ftue_personalize_complete_subtitle">Ваші налаштування збережено.</string>
+    <string name="ftue_personalize_complete_title">Усе налаштовано!</string>
+    <string name="ftue_personalize_lets_go">Поїхали</string>
+    <string name="ftue_profile_picture_subtitle">Ви можете змінити його будь-коли.</string>
+    <string name="ftue_profile_picture_title">Додати зображення профілю</string>
+    <string name="ftue_display_name_entry_footer">Ви можете змінити його пізніше</string>
+    <string name="ftue_display_name_entry_title">Показуване ім\'я</string>
+    <string name="ftue_display_name_subtitle">Його буде показано у надісланих повідомленнях.</string>
+    <string name="ftue_display_name_title">Виберіть показуване ім\'я</string>
+    <string name="ftue_account_created_subtitle">Ваш обліковий запис %s створено.</string>
+    <string name="ftue_account_created_congratulations_title">Вітаємо!</string>
+    <string name="ftue_account_created_take_me_home">На головну</string>
+    <string name="ftue_account_created_personalize">Персоналізувати профіль</string>
+    <string name="action_disable">Вимкнути</string>
+    <string name="location_share_live_started">Завантаження місцеперебування наживо…</string>
+    <string name="location_share_live_select_duration_option_3">8 годин</string>
+    <string name="location_share_live_select_duration_option_2">1 годину</string>
+    <string name="location_share_live_select_duration_option_1">15 хвилин</string>
+    <string name="location_share_live_select_duration_title">Ділитися своїм місцеперебуванням наживо</string>
+    <string name="audio_message_file_size">(%1$s)</string>
+    <string name="audio_message_reply_content">%1$s (%2$s)</string>
+    <string name="error_audio_message_unable_to_play">Неможливо відтворити %1$s</string>
+    <string name="a11y_pause_audio_message">Зупинити %1$s</string>
+    <string name="a11y_play_audio_message">Відтворити %1$s</string>
+    <string name="a11y_audio_playback_duration">%1$d хвилин %2$d секунд</string>
+    <string name="a11y_audio_message_item">%1$s, %2$s, %3$s</string>
+    <string name="sent_live_location">Ділиться своїм місцеперебуванням наживо</string>
+    <string name="ftue_auth_carousel_workplace_body">${app_name} також чудово підходить для роботи. Йому довіряють найтаємніші організації світу.</string>
+    <string name="beta">БЕТА</string>
+    <string name="send_feedback_threads_info">Треди — це поточна розробка з новими, захопливими майбутніми функціями, такими як вдосконалені сповіщення. Ми хотіли б почути ваш відгук!</string>
+    <string name="send_feedback_threads_title">Відгук про Треди бета</string>
+    <string name="give_feedback_threads">Надіслати відгук</string>
+    <string name="beta_title_bottom_sheet_action">БЕТА</string>
+    <string name="settings_presence_user_always_appears_offline_summary">Якщо ввімкнено, ви завжди будете видимі в режимі офлайн для інших користувачів, навіть коли користуєтеся застосунком.</string>
+    <string name="settings_presence_user_always_appears_offline">Офлайн режим</string>
+    <string name="settings_presence">Присутність</string>
+    <string name="threads_labs_enable_notice_message">Ваш домашній сервер не підтримує тредів, тому ця функція може бути ненадійною. Деякі треди повідомлень можуть бути недоступними. %sУсе одно хочете ввімкнути треди\?</string>
+    <string name="threads_labs_enable_notice_title">Треди бета</string>
+    <string name="threads_beta_enable_notice_message">Треди допомагають упорядкувати свої розмови за темами та легко стежити за ними. %sУвімкнення тредів перезавантажить застосунок. Це може тривати більше часу для деяких облікових записів.</string>
+    <string name="threads_beta_enable_notice_title">Треди бета</string>
+    <string name="action_learn_more">Докладніше</string>
+    <string name="action_try_it_out">Спробувати</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 67bf3f5e06..ec3045ec22 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -867,7 +867,9 @@
 \n
 \n你随时可以在通用设置中反转此操作。</string>
     <string name="room_participants_action_unignore_title">取消忽略用户</string>
-    <string name="room_participants_action_unignore_prompt_msg">取消忽略此用户将重新显示来自他们的全部消息。</string>
+    <string name="room_participants_action_unignore_prompt_msg">取消忽略此用户将重新显示来自他们的全部消息。
+\n
+\n请注意：此操作将重新启动应用程序，并且可能需要一些时间。</string>
     <string name="room_participants_action_cancel_invite_title">取消邀请</string>
     <string name="room_participants_action_cancel_invite_prompt_msg">你确定想要取消邀请此用户吗？</string>
     <string name="room_participants_remove_title">踢掉用户</string>
@@ -2284,4 +2286,12 @@
     <plurals name="notice_room_server_acl_changes">
         <item quantity="other">修改服务器 %d 的 ACLs</item>
     </plurals>
+    <string name="thread_list_empty_subtitle">子区有助于保持您的对话主题并易于跟踪</string>
+    <string name="thread_list_modal_all_threads_subtitle">显示当前房间的所有子区</string>
+    <string name="thread_list_modal_all_threads_title">所有子区</string>
+    <string name="thread_list_modal_title">筛选器</string>
+    <string name="thread_timeline_title">子区</string>
+    <string name="room_threads_filter">在房间中筛选子区</string>
+    <string name="action_thread_copy_link_to_thread">复制子区的链接</string>
+    <string name="action_thread_view_in_room">在房间中查看</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 781591ace7..f93374acdb 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -1501,7 +1501,9 @@
 \n
 \n您隨時都可以在一般設定中撤銷此動作。</string>
     <string name="room_participants_action_unignore_title">取消忽略使用者</string>
-    <string name="room_participants_action_unignore_prompt_msg">取消忽略此使用者將再次顯示從他們而來的所有訊息。</string>
+    <string name="room_participants_action_unignore_prompt_msg">取消忽略此使用者將再次顯示從他們而來的所有訊息。
+\n
+\n注意，此動作將會重新啟動應用程式，且可能需要一些時間。</string>
     <string name="room_participants_action_cancel_invite_title">取消邀請</string>
     <string name="room_participants_action_cancel_invite_prompt_msg">您確定您想要取消對此使用者的邀請嗎？</string>
     <string name="room_participants_remove_title">踢除使用者</string>
@@ -2391,4 +2393,51 @@
 \n
 \n這會是一次性的過渡，因為討論串現在是 Matrix 規範的一部分了。</string>
     <string name="threads_notice_migration_title">討論串接近測試版了 🎉</string>
+    <string name="live_location_sharing_notification_description">正在進行位置分享</string>
+    <string name="live_location_sharing_notification_title">${app_name} 即時位置</string>
+    <string name="error_forbidden_digits_only_username">家伺服器不接受僅有數字的使用者名稱。</string>
+    <string name="ftue_personalize_skip_this_step">略過此步驟</string>
+    <string name="ftue_personalize_submit">儲存並繼續</string>
+    <string name="ftue_personalize_complete_subtitle">您的偏好設定已儲存。</string>
+    <string name="ftue_personalize_complete_title">準備好了！</string>
+    <string name="ftue_personalize_lets_go">走吧</string>
+    <string name="ftue_profile_picture_subtitle">您可以在任何時候變更這個。</string>
+    <string name="ftue_profile_picture_title">新增個人資訊照片</string>
+    <string name="ftue_display_name_entry_footer">您可以在稍後變更這個</string>
+    <string name="ftue_display_name_entry_title">顯示名稱</string>
+    <string name="ftue_display_name_subtitle">這將會在您傳送訊息時顯示。</string>
+    <string name="ftue_display_name_title">選擇顯示名稱</string>
+    <string name="ftue_account_created_subtitle">您的帳號 %s 已建立。</string>
+    <string name="ftue_account_created_congratulations_title">恭喜！</string>
+    <string name="ftue_account_created_take_me_home">帶我回家</string>
+    <string name="ftue_account_created_personalize">個人化檔案</string>
+    <string name="action_disable">停用</string>
+    <string name="location_share_live_started">正在載入即時位置……</string>
+    <string name="location_share_live_select_duration_option_3">8小時</string>
+    <string name="location_share_live_select_duration_option_2">1小時</string>
+    <string name="location_share_live_select_duration_option_1">15分鐘</string>
+    <string name="location_share_live_select_duration_title">分享您的即時位置</string>
+    <string name="audio_message_file_size">(%1$s)</string>
+    <string name="audio_message_reply_content">%1$s (%2$s)</string>
+    <string name="error_audio_message_unable_to_play">無法播放 %1$s</string>
+    <string name="a11y_pause_audio_message">暫停 %1$s</string>
+    <string name="a11y_play_audio_message">播放 %1$s</string>
+    <string name="a11y_audio_playback_duration">%1$d分鐘%2$d秒</string>
+    <string name="a11y_audio_message_item">%1$s, %2$s, %3$s</string>
+    <string name="sent_live_location">分享了他們的即時位置</string>
+    <string name="ftue_auth_carousel_workplace_body">${app_name} 也非常適合工作場所。其受到世界上最安全的組織信任。</string>
+    <string name="beta">測試版</string>
+    <string name="send_feedback_threads_info">討論串是一項正在進行中的工作，包含了新的、令人興奮的即將推出的功能，例如改進的通知。我們想要聽到您的回饋！</string>
+    <string name="send_feedback_threads_title">討論串測試版回饋</string>
+    <string name="give_feedback_threads">給予回饋</string>
+    <string name="beta_title_bottom_sheet_action">測試版</string>
+    <string name="settings_presence_user_always_appears_offline_summary">若啟用，即使在使用應用程式時，您也會對其他使用者顯示為離線狀態。</string>
+    <string name="settings_presence_user_always_appears_offline">離線模式</string>
+    <string name="settings_presence">在場</string>
+    <string name="threads_labs_enable_notice_message">您的家伺服器目前不支援討論串，所以此功能可能不可靠。部份已進入討論串的訊息可能無法可靠地使用。%s您仍想啟用討論串嗎？</string>
+    <string name="threads_labs_enable_notice_title">討論串測試版</string>
+    <string name="threads_beta_enable_notice_message">討論串有助於讓您的對話不離題且易於追蹤。%s啟用討論串將會重新整理應用程式。對於特定帳號，可能需要更長的時間。</string>
+    <string name="threads_beta_enable_notice_title">討論串測試版</string>
+    <string name="action_learn_more">取得更多資訊</string>
+    <string name="action_try_it_out">試試看</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index ffd4333071..058ad29b18 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+
     <string name="notice_room_invite_no_invitee">%s\'s invitation</string>
     <string name="notice_room_invite_no_invitee_by_you">Your invitation</string>
     <string name="notice_room_created">%1$s created the room</string>
@@ -176,6 +177,9 @@
     <string name="initial_sync_start_importing_account_groups">Initial sync:\nImporting communities</string>
     <string name="initial_sync_start_importing_account_data">Initial sync:\nImporting account data</string>
 
+    <string name="initial_sync_request_title">Initial sync request</string>
+    <string name="initial_sync_request_content">${app_name} needs to perform a clear cache to be up to date, for the following reason:\n%s\n\nNote that this action will restart the app and it may take some time.</string>
+    <string name="initial_sync_request_reason_unignored_users">- Some users have been unignored</string>
 
     <string name="event_status_sent_message">Message sent</string>
     <string name="event_status_sending_message">Sending message…</string>
@@ -480,6 +484,8 @@
     <string name="call_camera_back">Back</string>
     <string name="call_format_turn_hd_off">Turn HD off</string>
     <string name="call_format_turn_hd_on">Turn HD on</string>
+    <string name="call_start_screen_sharing">Share screen</string>
+    <string name="call_stop_screen_sharing">Stop screen sharing</string>
 
     <string name="option_send_files">Send files</string>
     <string name="option_send_sticker">Send sticker</string>
@@ -634,7 +640,7 @@
     <string name="room_participants_action_ignore">Ignore</string>
 
     <string name="room_participants_action_unignore_title">Unignore user</string>
-    <string name="room_participants_action_unignore_prompt_msg">Unignoring this user will show all messages from them again.\n\nNote that this action will restart the app and it may take some time.</string>
+    <string name="room_participants_action_unignore_prompt_msg">Unignoring this user will show all messages from them again.</string>
     <string name="room_participants_action_unignore">Unignore</string>
 
     <string name="room_participants_action_cancel_invite_title">Cancel invite</string>
@@ -739,6 +745,9 @@
     <string name="threads_beta_enable_notice_title">Threads Beta</string>
     <!-- %s will be replaced with action_learn_more string resource that will be clickable(url redirection)  -->
     <string name="threads_beta_enable_notice_message">Threads help keep your conversations on-topic and easy to track. %sEnabling threads will refresh the app. This may take longer for some accounts.</string>
+    <string name="threads_labs_enable_notice_title">Threads Beta</string>
+    <string name="threads_labs_enable_notice_message">Your homeserver does not currently support threads, so this feature may be unreliable. Some threaded messages may not be reliably available. %sDo you want to enable threads anyway?</string>
+
 
     <!-- Search -->
     <string name="search_hint">Search</string>
@@ -1032,7 +1041,7 @@
     <string name="settings_fail_to_update_password">Failed to update password</string>
     <string name="settings_fail_to_update_password_invalid_current_password">The password is not valid</string>
     <string name="settings_password_updated">Your password has been updated</string>
-    <string name="settings_unignore_user">Show all messages from %s?\n\nNote that this action will restart the app and it may take some time.</string>
+    <string name="settings_unignore_user">Show all messages from %s?</string>
 
     <string name="settings_emails_and_phone_numbers_title">Emails and phone numbers</string>
     <string name="settings_emails_and_phone_numbers_summary">Manage emails and phone numbers linked to your Matrix account</string>
@@ -1660,7 +1669,8 @@
     <string name="you_may_contact_me">You may contact me if you have any follow up questions</string>
     <string name="feedback_sent">Thanks, your feedback has been successfully sent</string>
     <string name="feedback_failed">The feedback failed to be sent (%s)</string>
-    <string name="give_feedback">Give Feedback</string>
+    <!-- TODO TO BE REMOVED -->
+    <string name="give_feedback" tools:ignore="UnusedResources">Give Feedback</string>
     <string name="give_feedback_threads">Give Feedback</string>
     <string name="send_feedback_threads_title">Threads Beta feedback</string>
     <string name="send_feedback_threads_info">Threads are a work in progress with new, exciting upcoming features, such as improved notifications. We’d love to hear your feedback!</string>
@@ -2168,7 +2178,7 @@
     <string name="direct_room_profile_section_more_leave">Leave</string>
     <string name="room_profile_leaving_room">"Leaving the room…"</string>
 
-    <string name="room_member_override_nick_color">Override nick color</string>
+    <string name="room_member_override_nick_color">Override display name color</string>
 
     <string name="room_member_power_level_admins">Admins</string>
     <string name="room_member_power_level_moderators">Moderators</string>
@@ -3023,4 +3033,8 @@
     <string name="room_message_notify_everyone">Notify the whole room</string>
     <string name="room_message_autocomplete_users">Users</string>
     <string name="room_message_autocomplete_notification">Room notification</string>
+
+    <!-- Screen sharing -->
+    <string name="screen_sharing_notification_title">${app_name} Screen Sharing</string>
+    <string name="screen_sharing_notification_description">Screen sharing is in progress</string>
 </resources>
diff --git a/vector/src/main/res/xml/vector_settings_root.xml b/vector/src/main/res/xml/vector_settings_root.xml
index 744694cf5f..0c50083d53 100644
--- a/vector/src/main/res/xml/vector_settings_root.xml
+++ b/vector/src/main/res/xml/vector_settings_root.xml
@@ -32,12 +32,6 @@
         app:fragment="im.vector.app.features.settings.VectorSettingsVoiceVideoFragment"
         app:isPreferenceVisible="@bool/settings_root_voice_video_visible" />
 
-    <im.vector.app.core.preference.VectorPreference
-        android:icon="@drawable/ic_settings_root_ignored_users"
-        android:title="@string/settings_ignored_users"
-        app:fragment="im.vector.app.features.settings.ignored.VectorSettingsIgnoredUsersFragment"
-        app:isPreferenceVisible="@bool/settings_root_ignored_users_visible" />
-
     <im.vector.app.core.preference.VectorPreference
         android:icon="@drawable/ic_settings_root_security_privacy"
         android:title="@string/settings_security_and_privacy"
diff --git a/vector/src/main/res/xml/vector_settings_security_privacy.xml b/vector/src/main/res/xml/vector_settings_security_privacy.xml
index cd413e3fec..d4dfed2fcf 100644
--- a/vector/src/main/res/xml/vector_settings_security_privacy.xml
+++ b/vector/src/main/res/xml/vector_settings_security_privacy.xml
@@ -101,6 +101,19 @@
 
     </im.vector.app.core.preference.VectorPreferenceCategory>
 
+    <im.vector.app.core.preference.VectorPreferenceCategory
+        android:key="SETTINGS_IGNORED_USERS_PREFERENCE_CATEGORY_KEY"
+        android:title="@string/settings_ignored_users"
+        app:isPreferenceVisible="@bool/settings_ignored_users_visible">
+
+        <im.vector.app.core.preference.VectorPreference
+            android:icon="@drawable/ic_settings_root_ignored_users"
+            android:key="SETTINGS_IGNORED_USERS_PREFERENCE_KEY"
+            android:title="@string/settings_ignored_users"
+            app:fragment="im.vector.app.features.settings.ignored.VectorSettingsIgnoredUsersFragment" />
+
+    </im.vector.app.core.preference.VectorPreferenceCategory>
+
     <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_ANALYTICS_PREFERENCE_KEY"
         android:title="@string/settings_analytics">
diff --git a/vector/src/test/java/im/vector/app/features/crypto/UISIDetectorTest.kt b/vector/src/test/java/im/vector/app/features/crypto/UISIDetectorTest.kt
new file mode 100644
index 0000000000..d47855d75e
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/crypto/UISIDetectorTest.kt
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.crypto
+
+import im.vector.app.E2EMessageDetected
+import im.vector.app.UISIDetector
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import org.amshove.kluent.fail
+import org.junit.Assert
+import org.junit.Test
+import org.matrix.android.sdk.api.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.api.session.crypto.MXCryptoError
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.content.EncryptedEventContent
+import org.matrix.android.sdk.api.session.events.model.toContent
+
+class UISIDetectorTest {
+
+    @Test
+    fun `trigger detection after grace period`() {
+        val gracePeriod = 5_000L
+        val uisiDetector = UISIDetector(gracePeriod)
+        var detectedEvent: E2EMessageDetected? = null
+
+        uisiDetector.callback = object : UISIDetector.UISIDetectorCallback {
+            override val enabled = true
+            override val reciprocateToDeviceEventType = "foo"
+
+            override fun uisiDetected(source: E2EMessageDetected) {
+                detectedEvent = source
+            }
+
+            override fun uisiReciprocateRequest(source: Event) {
+                // nop
+            }
+        }
+
+        // report a decryption error
+        val eventId = "0001"
+        val event = fakeEncryptedEvent(eventId, "s1", "r1")
+        uisiDetector.onEventDecryptionError(event, fakeCryptoError())
+
+        runBlocking {
+            delay((gracePeriod * 1.2).toLong())
+        }
+        Assert.assertEquals(eventId, detectedEvent?.eventId)
+    }
+
+    @Test
+    fun `If event decrypted during grace period should not trigger detection`() {
+        val scope = CoroutineScope(SupervisorJob())
+        val gracePeriod = 5_000L
+        val uisiDetector = UISIDetector(gracePeriod)
+
+        uisiDetector.callback = object : UISIDetector.UISIDetectorCallback {
+            override val enabled = true
+            override val reciprocateToDeviceEventType = "foo"
+
+            override fun uisiDetected(source: E2EMessageDetected) {
+                fail("Shouldn't trigger")
+            }
+
+            override fun uisiReciprocateRequest(source: Event) {
+                // nop
+            }
+        }
+
+        // report a decryption error
+        val event = fakeEncryptedEvent("0001", "s1", "r1")
+        uisiDetector.onEventDecryptionError(event, fakeCryptoError())
+
+        // the grace period is 30s
+        scope.launch(Dispatchers.Default) {
+            delay((gracePeriod * 0.5).toLong())
+            uisiDetector.onEventDecrypted(event, emptyMap())
+        }
+
+        runBlocking {
+            delay((gracePeriod * 1.2).toLong())
+        }
+    }
+
+    private fun fakeEncryptedEvent(eventId: String, sessionId: String, roomId: String): Event {
+        return Event(
+                type = EventType.ENCRYPTED,
+                eventId = eventId,
+                roomId = roomId,
+                content = EncryptedEventContent(
+                        algorithm = MXCRYPTO_ALGORITHM_MEGOLM,
+                        ciphertext = "AwgBEpACQEKOkd4Gp0+gSXG4M+btcrnPgsF23xs/lUmS2I4YjmqF...",
+                        sessionId = sessionId,
+                        senderKey = "5e3EIqg3JfooZnLQ2qHIcBarbassQ4qXblai0",
+                        deviceId = "FAKEE"
+                ).toContent()
+        )
+    }
+
+    private fun fakeCryptoError(error: MXCryptoError.ErrorType = MXCryptoError.ErrorType.UNKNOWN_INBOUND_SESSION_ID) = MXCryptoError.Base(
+            error,
+            "A description",
+            "Human readable"
+    )
+}
diff --git a/vector/src/test/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModelTest.kt b/vector/src/test/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModelTest.kt
index 7562dfdf14..abd730707d 100644
--- a/vector/src/test/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModelTest.kt
@@ -52,10 +52,12 @@ class SharedSecureStorageViewModelTest {
         val viewModel = createViewModel()
         viewModel
                 .test()
-                .assertState(aViewState(
-                        hasPassphrase = true,
-                        step = SharedSecureStorageViewState.Step.EnterPassphrase
-                ))
+                .assertState(
+                        aViewState(
+                                hasPassphrase = true,
+                                step = SharedSecureStorageViewState.Step.EnterPassphrase
+                        )
+                )
                 .finish()
     }
 
@@ -67,10 +69,12 @@ class SharedSecureStorageViewModelTest {
 
         viewModel
                 .test()
-                .assertState(aViewState(
-                        hasPassphrase = false,
-                        step = SharedSecureStorageViewState.Step.EnterKey
-                ))
+                .assertState(
+                        aViewState(
+                                hasPassphrase = false,
+                                step = SharedSecureStorageViewState.Step.EnterKey
+                        )
+                )
                 .finish()
     }
 
diff --git a/vector/src/test/java/im/vector/app/features/media/domain/usecase/DownloadMediaUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/media/domain/usecase/DownloadMediaUseCaseTest.kt
index bb05357cb2..d45e6e7ce1 100644
--- a/vector/src/test/java/im/vector/app/features/media/domain/usecase/DownloadMediaUseCaseTest.kt
+++ b/vector/src/test/java/im/vector/app/features/media/domain/usecase/DownloadMediaUseCaseTest.kt
@@ -23,6 +23,7 @@ import com.airbnb.mvrx.test.MvRxTestRule
 import im.vector.app.core.intent.getMimeTypeFromUri
 import im.vector.app.core.utils.saveMedia
 import im.vector.app.features.notifications.NotificationUtils
+import im.vector.app.test.fakes.FakeClock
 import im.vector.app.test.fakes.FakeFile
 import im.vector.app.test.fakes.FakeSession
 import io.mockk.MockKAnnotations
@@ -57,6 +58,8 @@ class DownloadMediaUseCaseTest {
     @MockK
     lateinit var notificationUtils: NotificationUtils
 
+    private val clock = FakeClock()
+
     private val file = FakeFile()
 
     @OverrideMockKs
@@ -85,7 +88,8 @@ class DownloadMediaUseCaseTest {
         every { getMimeTypeFromUri(appContext, uri) } returns mimeType
         file.givenName(name)
         file.givenUri(uri)
-        coEvery { saveMedia(any(), any(), any(), any(), any()) } just runs
+        clock.givenEpoch(123)
+        coEvery { saveMedia(any(), any(), any(), any(), any(), any()) } just runs
 
         // When
         val result = downloadMediaUseCase.execute(file.instance)
@@ -100,7 +104,7 @@ class DownloadMediaUseCaseTest {
             getMimeTypeFromUri(appContext, uri)
         }
         coVerify {
-            saveMedia(appContext, file.instance, name, mimeType, notificationUtils)
+            saveMedia(appContext, file.instance, name, mimeType, notificationUtils, 123)
         }
     }
 
@@ -113,8 +117,9 @@ class DownloadMediaUseCaseTest {
         val error = Throwable()
         file.givenName(name)
         file.givenUri(uri)
+        clock.givenEpoch(345)
         every { getMimeTypeFromUri(appContext, uri) } returns mimeType
-        coEvery { saveMedia(any(), any(), any(), any(), any()) } throws error
+        coEvery { saveMedia(any(), any(), any(), any(), any(), any()) } throws error
 
         // When
         val result = downloadMediaUseCase.execute(file.instance)
@@ -129,7 +134,7 @@ class DownloadMediaUseCaseTest {
             getMimeTypeFromUri(appContext, uri)
         }
         coVerify {
-            saveMedia(appContext, file.instance, name, mimeType, notificationUtils)
+            saveMedia(appContext, file.instance, name, mimeType, notificationUtils, 345)
         }
     }
 }
diff --git a/vector/src/test/java/im/vector/app/features/notifications/NotificationEventQueueTest.kt b/vector/src/test/java/im/vector/app/features/notifications/NotificationEventQueueTest.kt
index 3429f882f8..7499a2feae 100644
--- a/vector/src/test/java/im/vector/app/features/notifications/NotificationEventQueueTest.kt
+++ b/vector/src/test/java/im/vector/app/features/notifications/NotificationEventQueueTest.kt
@@ -28,12 +28,14 @@ class NotificationEventQueueTest {
 
     @Test
     fun `given events when redacting some then marks matching event ids as redacted`() {
-        val queue = givenQueue(listOf(
-                aSimpleNotifiableEvent(eventId = "redacted-id-1"),
-                aNotifiableMessageEvent(eventId = "redacted-id-2"),
-                anInviteNotifiableEvent(eventId = "redacted-id-3"),
-                aSimpleNotifiableEvent(eventId = "kept-id"),
-        ))
+        val queue = givenQueue(
+                listOf(
+                        aSimpleNotifiableEvent(eventId = "redacted-id-1"),
+                        aNotifiableMessageEvent(eventId = "redacted-id-2"),
+                        anInviteNotifiableEvent(eventId = "redacted-id-3"),
+                        aSimpleNotifiableEvent(eventId = "kept-id"),
+                )
+        )
 
         queue.markRedacted(listOf("redacted-id-1", "redacted-id-2", "redacted-id-3"))
 
@@ -77,10 +79,12 @@ class NotificationEventQueueTest {
 
     @Test
     fun `given events when syncing without rooms left or joined ids then does not change the events`() {
-        val queue = givenQueue(listOf(
-                aNotifiableMessageEvent(roomId = "a-room-id"),
-                anInviteNotifiableEvent(roomId = "a-room-id")
-        ))
+        val queue = givenQueue(
+                listOf(
+                        aNotifiableMessageEvent(roomId = "a-room-id"),
+                        anInviteNotifiableEvent(roomId = "a-room-id")
+                )
+        )
 
         queue.syncRoomEvents(roomsLeft = emptyList(), roomsJoined = emptyList())
 
@@ -145,7 +149,7 @@ class NotificationEventQueueTest {
     @Test
     fun `given replaceable event when adding event with same id then updates existing event`() {
         val replaceableEvent = aSimpleNotifiableEvent(canBeReplaced = true)
-        val updatedEvent = replaceableEvent.copy(title = "updated title")
+        val updatedEvent = replaceableEvent.copy(title = "updated title", isUpdated = true)
         val queue = givenQueue(listOf(replaceableEvent))
 
         queue.add(updatedEvent)
@@ -167,7 +171,7 @@ class NotificationEventQueueTest {
     @Test
     fun `given event when adding new event with edited event id matching the existing event id then updates existing event`() {
         val editedEvent = aSimpleNotifiableEvent(eventId = "id-to-edit")
-        val updatedEvent = editedEvent.copy(eventId = "1", editedEventId = "id-to-edit", title = "updated title")
+        val updatedEvent = editedEvent.copy(eventId = "1", editedEventId = "id-to-edit", title = "updated title", isUpdated = true)
         val queue = givenQueue(listOf(editedEvent))
 
         queue.add(updatedEvent)
@@ -178,7 +182,7 @@ class NotificationEventQueueTest {
     @Test
     fun `given event when adding new event with edited event id matching the existing event edited id then updates existing event`() {
         val editedEvent = aSimpleNotifiableEvent(eventId = "0", editedEventId = "id-to-edit")
-        val updatedEvent = editedEvent.copy(eventId = "1", editedEventId = "id-to-edit", title = "updated title")
+        val updatedEvent = editedEvent.copy(eventId = "1", editedEventId = "id-to-edit", title = "updated title", isUpdated = true)
         val queue = givenQueue(listOf(editedEvent))
 
         queue.add(updatedEvent)
@@ -189,10 +193,12 @@ class NotificationEventQueueTest {
     @Test
     fun `when clearing membership notification then removes invite events with matching room id`() {
         val roomId = "a-room-id"
-        val queue = givenQueue(listOf(
-                anInviteNotifiableEvent(roomId = roomId),
-                aNotifiableMessageEvent(roomId = roomId)
-        ))
+        val queue = givenQueue(
+                listOf(
+                        anInviteNotifiableEvent(roomId = roomId),
+                        aNotifiableMessageEvent(roomId = roomId)
+                )
+        )
 
         queue.clearMemberShipNotificationForRoom(roomId)
 
@@ -202,10 +208,12 @@ class NotificationEventQueueTest {
     @Test
     fun `when clearing messages for room then removes message events with matching room id`() {
         val roomId = "a-room-id"
-        val queue = givenQueue(listOf(
-                anInviteNotifiableEvent(roomId = roomId),
-                aNotifiableMessageEvent(roomId = roomId)
-        ))
+        val queue = givenQueue(
+                listOf(
+                        anInviteNotifiableEvent(roomId = roomId),
+                        aNotifiableMessageEvent(roomId = roomId)
+                )
+        )
 
         queue.clearMessagesForRoom(roomId)
 
diff --git a/vector/src/test/java/im/vector/app/features/notifications/NotificationFactoryTest.kt b/vector/src/test/java/im/vector/app/features/notifications/NotificationFactoryTest.kt
index f0f9a4dbc7..e88f01d4e3 100644
--- a/vector/src/test/java/im/vector/app/features/notifications/NotificationFactoryTest.kt
+++ b/vector/src/test/java/im/vector/app/features/notifications/NotificationFactoryTest.kt
@@ -54,14 +54,16 @@ class NotificationFactoryTest {
 
         val result = roomInvitation.toNotifications(MY_USER_ID)
 
-        result shouldBeEqualTo listOf(OneShotNotification.Append(
-                notification = expectedNotification,
-                meta = OneShotNotification.Append.Meta(
-                        key = A_ROOM_ID,
-                        summaryLine = AN_INVITATION_EVENT.description,
-                        isNoisy = AN_INVITATION_EVENT.noisy,
-                        timestamp = AN_INVITATION_EVENT.timestamp
-                ))
+        result shouldBeEqualTo listOf(
+                OneShotNotification.Append(
+                        notification = expectedNotification,
+                        meta = OneShotNotification.Append.Meta(
+                                key = A_ROOM_ID,
+                                summaryLine = AN_INVITATION_EVENT.description,
+                                isNoisy = AN_INVITATION_EVENT.noisy,
+                                timestamp = AN_INVITATION_EVENT.timestamp
+                        )
+                )
         )
     }
 
@@ -71,9 +73,11 @@ class NotificationFactoryTest {
 
         val result = missingEventRoomInvitation.toNotifications(MY_USER_ID)
 
-        result shouldBeEqualTo listOf(OneShotNotification.Removed(
-                key = A_ROOM_ID
-        ))
+        result shouldBeEqualTo listOf(
+                OneShotNotification.Removed(
+                        key = A_ROOM_ID
+                )
+        )
     }
 
     @Test
@@ -83,14 +87,16 @@ class NotificationFactoryTest {
 
         val result = roomInvitation.toNotifications(MY_USER_ID)
 
-        result shouldBeEqualTo listOf(OneShotNotification.Append(
-                notification = expectedNotification,
-                meta = OneShotNotification.Append.Meta(
-                        key = AN_EVENT_ID,
-                        summaryLine = A_SIMPLE_EVENT.description,
-                        isNoisy = A_SIMPLE_EVENT.noisy,
-                        timestamp = AN_INVITATION_EVENT.timestamp
-                ))
+        result shouldBeEqualTo listOf(
+                OneShotNotification.Append(
+                        notification = expectedNotification,
+                        meta = OneShotNotification.Append.Meta(
+                                key = AN_EVENT_ID,
+                                summaryLine = A_SIMPLE_EVENT.description,
+                                isNoisy = A_SIMPLE_EVENT.noisy,
+                                timestamp = AN_INVITATION_EVENT.timestamp
+                        )
+                )
         )
     }
 
@@ -100,9 +106,11 @@ class NotificationFactoryTest {
 
         val result = missingEventRoomInvitation.toNotifications(MY_USER_ID)
 
-        result shouldBeEqualTo listOf(OneShotNotification.Removed(
-                key = AN_EVENT_ID
-        ))
+        result shouldBeEqualTo listOf(
+                OneShotNotification.Removed(
+                        key = AN_EVENT_ID
+                )
+        )
     }
 
     @Test
@@ -123,9 +131,11 @@ class NotificationFactoryTest {
 
         val result = emptyRoom.toNotifications(MY_USER_ID, MY_AVATAR_URL)
 
-        result shouldBeEqualTo listOf(RoomNotification.Removed(
-                roomId = A_ROOM_ID
-        ))
+        result shouldBeEqualTo listOf(
+                RoomNotification.Removed(
+                        roomId = A_ROOM_ID
+                )
+        )
     }
 
     @Test
@@ -134,17 +144,23 @@ class NotificationFactoryTest {
 
         val result = redactedRoom.toNotifications(MY_USER_ID, MY_AVATAR_URL)
 
-        result shouldBeEqualTo listOf(RoomNotification.Removed(
-                roomId = A_ROOM_ID
-        ))
+        result shouldBeEqualTo listOf(
+                RoomNotification.Removed(
+                        roomId = A_ROOM_ID
+                )
+        )
     }
 
     @Test
-    fun `given a room with redacted and non redacted message events when mapping to notification then redacted events are removed`() = testWith(notificationFactory) {
-        val roomWithRedactedMessage = mapOf(A_ROOM_ID to listOf(
-                ProcessedEvent(Type.KEEP, A_MESSAGE_EVENT.copy(isRedacted = true)),
-                ProcessedEvent(Type.KEEP, A_MESSAGE_EVENT.copy(eventId = "not-redacted"))
-        ))
+    fun `given a room with redacted and non redacted message events when mapping to notification then redacted events are removed`() = testWith(
+            notificationFactory
+    ) {
+        val roomWithRedactedMessage = mapOf(
+                A_ROOM_ID to listOf(
+                        ProcessedEvent(Type.KEEP, A_MESSAGE_EVENT.copy(isRedacted = true)),
+                        ProcessedEvent(Type.KEEP, A_MESSAGE_EVENT.copy(eventId = "not-redacted"))
+                )
+        )
         val withRedactedRemoved = listOf(A_MESSAGE_EVENT.copy(eventId = "not-redacted"))
         val expectedNotification = roomGroupMessageCreator.givenCreatesRoomMessageFor(withRedactedRemoved, A_ROOM_ID, MY_USER_ID, MY_AVATAR_URL)
 
diff --git a/vector/src/test/java/im/vector/app/features/notifications/NotificationRendererTest.kt b/vector/src/test/java/im/vector/app/features/notifications/NotificationRendererTest.kt
index 6dca0479e7..7bfdfdc40c 100644
--- a/vector/src/test/java/im/vector/app/features/notifications/NotificationRendererTest.kt
+++ b/vector/src/test/java/im/vector/app/features/notifications/NotificationRendererTest.kt
@@ -88,10 +88,14 @@ class NotificationRendererTest {
 
     @Test
     fun `given a room message group notification is added when rendering then show the message notification and update summary`() {
-        givenNotifications(roomNotifications = listOf(RoomNotification.Message(
-                A_NOTIFICATION,
-                MESSAGE_META
-        )))
+        givenNotifications(
+                roomNotifications = listOf(
+                        RoomNotification.Message(
+                                A_NOTIFICATION,
+                                MESSAGE_META
+                        )
+                )
+        )
 
         renderEventsAsNotifications()
 
@@ -127,10 +131,14 @@ class NotificationRendererTest {
 
     @Test
     fun `given a simple notification is added when rendering then show the simple notification and update summary`() {
-        givenNotifications(simpleNotifications = listOf(OneShotNotification.Append(
-                A_NOTIFICATION,
-                ONE_SHOT_META.copy(key = AN_EVENT_ID)
-        )))
+        givenNotifications(
+                simpleNotifications = listOf(
+                        OneShotNotification.Append(
+                                A_NOTIFICATION,
+                                ONE_SHOT_META.copy(key = AN_EVENT_ID)
+                        )
+                )
+        )
 
         renderEventsAsNotifications()
 
@@ -166,10 +174,14 @@ class NotificationRendererTest {
 
     @Test
     fun `given an invitation notification is added when rendering then show the invitation notification and update summary`() {
-        givenNotifications(simpleNotifications = listOf(OneShotNotification.Append(
-                A_NOTIFICATION,
-                ONE_SHOT_META.copy(key = A_ROOM_ID)
-        )))
+        givenNotifications(
+                simpleNotifications = listOf(
+                        OneShotNotification.Append(
+                                A_NOTIFICATION,
+                                ONE_SHOT_META.copy(key = A_ROOM_ID)
+                        )
+                )
+        )
 
         renderEventsAsNotifications()
 
diff --git a/vector/src/test/java/im/vector/app/features/onboarding/DirectLoginUseCaseTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/DirectLoginUseCaseTest.kt
index 5a3c323316..6021b755f4 100644
--- a/vector/src/test/java/im/vector/app/features/onboarding/DirectLoginUseCaseTest.kt
+++ b/vector/src/test/java/im/vector/app/features/onboarding/DirectLoginUseCaseTest.kt
@@ -65,7 +65,11 @@ class DirectLoginUseCaseTest {
 
     @Test
     fun `given wellknown fails with content, when logging in directly, then returns success with direct session result`() = runTest {
-        fakeAuthenticationService.givenWellKnown(A_LOGIN_OR_REGISTER_ACTION.username, config = NO_HOMESERVER_CONFIG, result = A_WELLKNOWN_FAILED_WITH_CONTENT_RESULT)
+        fakeAuthenticationService.givenWellKnown(
+                A_LOGIN_OR_REGISTER_ACTION.username,
+                config = NO_HOMESERVER_CONFIG,
+                result = A_WELLKNOWN_FAILED_WITH_CONTENT_RESULT
+        )
         val (username, password, initialDeviceName) = A_LOGIN_OR_REGISTER_ACTION
         fakeAuthenticationService.givenDirectAuthentication(A_FALLBACK_CONFIG, username, password, initialDeviceName, result = fakeSession)
 
@@ -76,7 +80,11 @@ class DirectLoginUseCaseTest {
 
     @Test
     fun `given wellknown fails without content, when logging in directly, then returns well known error`() = runTest {
-        fakeAuthenticationService.givenWellKnown(A_LOGIN_OR_REGISTER_ACTION.username, config = NO_HOMESERVER_CONFIG, result = A_WELLKNOWN_FAILED_WITHOUT_CONTENT_RESULT)
+        fakeAuthenticationService.givenWellKnown(
+                A_LOGIN_OR_REGISTER_ACTION.username,
+                config = NO_HOMESERVER_CONFIG,
+                result = A_WELLKNOWN_FAILED_WITHOUT_CONTENT_RESULT
+        )
         val (username, password, initialDeviceName) = A_LOGIN_OR_REGISTER_ACTION
         fakeAuthenticationService.givenDirectAuthentication(A_FALLBACK_CONFIG, username, password, initialDeviceName, result = fakeSession)
 
diff --git a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
index 62fc9548b2..c26c73a9a7 100644
--- a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
@@ -105,7 +105,14 @@ class OnboardingViewModelTest {
 
     @Test
     fun `given supports changing display name, when handling PersonalizeProfile, then emits contents choose display name`() = runTest {
-        viewModelWith(initialState.copy(personalizationState = PersonalizationState(supportsChangingDisplayName = true, supportsChangingProfilePicture = false)))
+        viewModelWith(
+                initialState.copy(
+                        personalizationState = PersonalizationState(
+                                supportsChangingDisplayName = true,
+                                supportsChangingProfilePicture = false
+                        )
+                )
+        )
         val test = viewModel.test()
 
         viewModel.handle(OnboardingAction.PersonalizeProfile)
@@ -117,7 +124,14 @@ class OnboardingViewModelTest {
 
     @Test
     fun `given only supports changing profile picture, when handling PersonalizeProfile, then emits contents choose profile picture`() = runTest {
-        viewModelWith(initialState.copy(personalizationState = PersonalizationState(supportsChangingDisplayName = false, supportsChangingProfilePicture = true)))
+        viewModelWith(
+                initialState.copy(
+                        personalizationState = PersonalizationState(
+                                supportsChangingDisplayName = false,
+                                supportsChangingProfilePicture = true
+                        )
+                )
+        )
         val test = viewModel.test()
 
         viewModel.handle(OnboardingAction.PersonalizeProfile)
@@ -473,10 +487,12 @@ class OnboardingViewModelTest {
 
     private fun givenSuccessfulRegistrationForStartAndDummySteps(missingStages: List<Stage>) {
         val flowResult = FlowResult(missingStages = missingStages, completedStages = emptyList())
-        givenRegistrationResultsFor(listOf(
-                A_LOADABLE_REGISTER_ACTION to RegistrationResult.FlowResponse(flowResult),
-                RegisterAction.RegisterDummy to RegistrationResult.Success(fakeSession)
-        ))
+        givenRegistrationResultsFor(
+                listOf(
+                        A_LOADABLE_REGISTER_ACTION to RegistrationResult.FlowResponse(flowResult),
+                        RegisterAction.RegisterDummy to RegistrationResult.Success(fakeSession)
+                )
+        )
         givenSuccessfullyCreatesAccount(A_HOMESERVER_CAPABILITIES)
     }
 
diff --git a/vector/src/test/java/im/vector/app/features/onboarding/ftueauth/FtueMissingRegistrationStagesComparatorTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/ftueauth/FtueMissingRegistrationStagesComparatorTest.kt
new file mode 100644
index 0000000000..010cf5de60
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/onboarding/ftueauth/FtueMissingRegistrationStagesComparatorTest.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.onboarding.ftueauth
+
+import im.vector.app.test.fixtures.aDummyStage
+import im.vector.app.test.fixtures.aMsisdnStage
+import im.vector.app.test.fixtures.aRecaptchaStage
+import im.vector.app.test.fixtures.aTermsStage
+import im.vector.app.test.fixtures.anEmailStage
+import im.vector.app.test.fixtures.anOtherStage
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+
+class FtueMissingRegistrationStagesComparatorTest {
+
+    @Test
+    fun `when ordering stages, then prioritizes email`() {
+        val input = listOf(
+                aDummyStage(),
+                anOtherStage(),
+                aMsisdnStage(),
+                anEmailStage(),
+                aRecaptchaStage(),
+                aTermsStage()
+        )
+
+        val result = input.sortedWith(FtueMissingRegistrationStagesComparator())
+
+        result shouldBeEqualTo listOf(
+                anEmailStage(),
+                aMsisdnStage(),
+                aTermsStage(),
+                aRecaptchaStage(),
+                anOtherStage(),
+                aDummyStage()
+        )
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeClock.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeClock.kt
new file mode 100644
index 0000000000..1d531f147f
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeClock.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.test.fakes
+
+import im.vector.app.core.time.Clock
+import io.mockk.every
+import io.mockk.mockk
+
+class FakeClock : Clock by mockk() {
+    fun givenEpoch(epoch: Long) {
+        every { epochMillis() } returns epoch
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeSession.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeSession.kt
index 1fff67e982..5f02879e65 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeSession.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeSession.kt
@@ -16,7 +16,6 @@
 
 package im.vector.app.test.fakes
 
-import android.net.Uri
 import im.vector.app.core.extensions.configureAndStart
 import im.vector.app.core.extensions.startSyncing
 import im.vector.app.core.extensions.vectorStore
@@ -27,6 +26,8 @@ import io.mockk.coJustRun
 import io.mockk.mockk
 import io.mockk.mockkStatic
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
+import org.matrix.android.sdk.api.session.profile.ProfileService
 
 class FakeSession(
         val fakeCryptoService: FakeCryptoService = FakeCryptoService(),
@@ -41,12 +42,12 @@ class FakeSession(
 
     override val myUserId: String = "@fake:server.fake"
 
-    override fun cryptoService() = fakeCryptoService
-    override val sharedSecretStorageService = fakeSharedSecretStorageService
     override val coroutineDispatchers = testCoroutineDispatchers
-    override suspend fun setDisplayName(userId: String, newDisplayName: String) = fakeProfileService.setDisplayName(userId, newDisplayName)
-    override suspend fun updateAvatar(userId: String, newAvatarUri: Uri, fileName: String) = fakeProfileService.updateAvatar(userId, newAvatarUri, fileName)
-    override fun getHomeServerCapabilities() = fakeHomeServerCapabilitiesService.getHomeServerCapabilities()
+
+    override fun cryptoService() = fakeCryptoService
+    override fun profileService(): ProfileService = fakeProfileService
+    override fun homeServerCapabilitiesService(): HomeServerCapabilitiesService = fakeHomeServerCapabilitiesService
+    override fun sharedSecretStorageService() = fakeSharedSecretStorageService
 
     fun givenVectorStore(vectorSessionStore: VectorSessionStore) {
         coEvery {
diff --git a/vector/src/test/java/im/vector/app/test/fixtures/StageFixtures.kt b/vector/src/test/java/im/vector/app/test/fixtures/StageFixtures.kt
new file mode 100644
index 0000000000..e06993523c
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fixtures/StageFixtures.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.test.fixtures
+
+import org.matrix.android.sdk.api.auth.registration.Stage
+
+fun aDummyStage() = Stage.Dummy(mandatory = true)
+fun anEmailStage() = Stage.Email(mandatory = true)
+fun aMsisdnStage() = Stage.Msisdn(mandatory = true)
+fun aTermsStage() = Stage.Terms(mandatory = true, policies = emptyMap<String, String>())
+fun aRecaptchaStage() = Stage.ReCaptcha(mandatory = true, publicKey = "any-key")
+fun anOtherStage() = Stage.Other(mandatory = true, type = "raw-type", params = emptyMap<String, String>())