diff --git a/app/src/androidTest/assets/backupTests/chat_folder_00.binproto b/app/src/androidTest/assets/backupTests/chat_folder_00.binproto
index 16ce6d6b45..f6c6213cfe 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_folder_00.binproto and b/app/src/androidTest/assets/backupTests/chat_folder_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_folder_01.binproto b/app/src/androidTest/assets/backupTests/chat_folder_01.binproto
index f1d44b9e98..9ca7ea0f61 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_folder_01.binproto and b/app/src/androidTest/assets/backupTests/chat_folder_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_folder_02.binproto b/app/src/androidTest/assets/backupTests/chat_folder_02.binproto
index 0dfc4222ae..f21f7e1e09 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_folder_02.binproto and b/app/src/androidTest/assets/backupTests/chat_folder_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_folder_03.binproto b/app/src/androidTest/assets/backupTests/chat_folder_03.binproto
index 4a5abd4405..d38a44b3ba 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_folder_03.binproto and b/app/src/androidTest/assets/backupTests/chat_folder_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_admin_deleted_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_admin_deleted_00.binproto
index 49f24ba346..5acc68c4df 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_admin_deleted_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_admin_deleted_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_admin_deleted_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_admin_deleted_01.binproto
index 06b263c663..f0610f51dc 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_admin_deleted_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_admin_deleted_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_admin_deleted_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_admin_deleted_02.binproto
index a4f994f56c..1d2300cea0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_admin_deleted_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_admin_deleted_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_00.binproto
index f71da2215b..144ce65531 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_01.binproto
index 2285691e9e..a37cdec5ac 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_02.binproto
index 3b949fcd9f..ac89c728ee 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_03.binproto
index 5aeb01635b..12a41ef599 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_04.binproto
index 2b3a67c332..c88480bb47 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_05.binproto
index 529ce84d41..3fe9cdbd7e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_06.binproto
index 5a65e6422a..fc30a900d3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_07.binproto
index 3d6a35b939..9fd37d6b4b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_call_update_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_call_update_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_00.binproto
index 80da703a78..5bd286fa51 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_01.binproto
index 25bef569a3..78e5428959 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_02.binproto
index 2380a13abe..13586f56ce 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_03.binproto
index 4dab27f563..91e2dec237 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_04.binproto
index 1222e08d88..5f2a872a70 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_05.binproto
index fd6139f536..a3e38ee089 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_06.binproto
index f3e22ce036..e21513a967 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_07.binproto
index 0242fb19f4..4d25b62c8b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_08.binproto
index fdfd0658f0..a2ffb73242 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_09.binproto
index e52274cb7f..8b75cca29d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_10.binproto
index c9580341d2..ab749767c4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_11.binproto
index 2b9698dfe8..6d4b0e05a4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_12.binproto
index a45385f6e3..553cef317e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_13.binproto
index 6b9a0fffd8..2ef74431b0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_14.binproto
index 1d0614d2c3..40b8b159b4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_15.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_15.binproto
index b052a9d5d4..2d5203b4db 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_15.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_15.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_16.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_16.binproto
index f27c420a3f..68a5e5046a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_16.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_multiple_update_16.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_00.binproto
index 4e7157dd29..def260c04b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_01.binproto
index a3179b1483..19578f6f91 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_02.binproto
index ca54d72c0f..4c6928e91b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_03.binproto
index ece0e944ed..78e8968867 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_04.binproto
index 0c5b1f4818..6e9abed379 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_05.binproto
index bab147bfd2..eb31e665d0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_06.binproto
index 75b68ffa2e..28018d02fc 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_07.binproto
index a8fe1c07e7..0591f2fc07 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_08.binproto
index 2650ce6f52..8baf683fd5 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_09.binproto
index bb7521cf80..4f1a7aa393 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_10.binproto
index 1dfe170675..77daf4abcd 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_11.binproto
index d20b7d1863..46702b1a95 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_12.binproto
index ff817cd483..5b881f4c9a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_13.binproto
index 806828f25f..6a5291a396 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_14.binproto
index 3493811c59..12077124c7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_15.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_15.binproto
index ef3c2f318a..213cbf138f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_15.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_15.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_16.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_16.binproto
index 7967f92669..637a719e3d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_16.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_16.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_17.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_17.binproto
index 8e1741015e..e13fcc23f6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_17.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_17.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_18.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_18.binproto
index e28c878145..d79b750cd7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_18.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_18.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_19.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_19.binproto
index c424286e20..f2a97a3f94 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_19.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_19.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_20.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_20.binproto
index 10f36cda5f..b443e1768e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_20.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_20.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_21.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_21.binproto
index e3e5e8aee3..a73e9fb8d7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_21.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_21.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_22.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_22.binproto
index 66b544a56c..e76fbfabfa 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_22.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_22.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_23.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_23.binproto
index 8e0d060549..e1a59f37fa 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_23.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_23.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_24.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_24.binproto
index 3ffcd46cd1..1d874031aa 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_24.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_24.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_25.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_25.binproto
index 83778c79e5..d78a4769c7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_25.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_25.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_26.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_26.binproto
index 5e549cbf12..cda6fd49d6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_26.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_26.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_27.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_27.binproto
index ffd836f20c..3e61bc0e96 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_27.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_27.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_28.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_28.binproto
index 918f6cde13..f6671bec61 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_28.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_28.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_29.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_29.binproto
index b8eb1e01c8..785cb0a965 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_29.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_29.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_30.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_30.binproto
index 20bf9994e0..63064f8943 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_30.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_30.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_31.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_31.binproto
index 51c89f2ed4..a874980151 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_31.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_31.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_32.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_32.binproto
index 2da2df2635..77880988a1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_32.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_32.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_33.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_33.binproto
index 06e9c5bb1c..3ea6d5e0f8 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_33.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_33.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_34.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_34.binproto
index 2da2df2635..77880988a1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_34.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_34.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_35.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_35.binproto
index 8726cfdc96..1ec1bd721b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_35.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_35.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_36.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_36.binproto
index 5ce4782e33..9cdaf206df 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_36.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_36.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_37.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_37.binproto
index cabd8d372e..e9d35a7f61 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_37.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_37.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_38.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_38.binproto
index aaf761c075..9a21535514 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_38.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_38.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_39.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_39.binproto
index 1d868d5c06..00dcf71fa0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_39.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_39.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_40.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_40.binproto
index 9b22f174d7..69a22619cb 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_40.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_40.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_41.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_41.binproto
index bf7fcb874b..3640a7d1be 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_41.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_41.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_42.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_42.binproto
index 7e8723acfb..74b19a6cbc 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_42.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_42.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_43.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_43.binproto
index d6850bd594..8335259de6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_43.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_43.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_44.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_44.binproto
index a78e992d20..4d0da3ba55 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_44.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_44.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_45.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_45.binproto
index 4b264ed679..b0f1b3dde5 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_45.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_45.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_46.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_46.binproto
index eecdd8b0cc..f3c86d7fd4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_46.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_46.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_47.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_47.binproto
index 8f13ec1683..c8cc7fa39b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_47.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_47.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_48.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_48.binproto
index 043be0e94d..af182fc6e4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_48.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_48.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_49.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_49.binproto
index 82a6114164..74b2812e5e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_49.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_49.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_50.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_50.binproto
index 0ec76b1d7e..66f3dc1417 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_50.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_50.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_51.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_51.binproto
index fa56d247e4..a4f0da441b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_51.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_51.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_52.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_52.binproto
index 0ce9b5d65d..a9ec3fc2b3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_52.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_52.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_53.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_53.binproto
index 61a26eb3cc..b08525f8d8 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_53.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_53.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_54.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_54.binproto
index 630b61b814..3f0c431bd0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_54.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_54.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_55.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_55.binproto
index 7e7882762b..0b4b846cc6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_55.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_55.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_56.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_56.binproto
index cc36ffed26..1f65854bab 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_56.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_56.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_57.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_57.binproto
index 6b0b29a3b0..e2090934dd 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_57.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_57.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_58.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_58.binproto
index 397775729f..48bf2b43b0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_58.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_58.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_59.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_59.binproto
index edd412e1f0..fa89616b0e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_59.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_59.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_60.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_60.binproto
index efc009d80f..a009d1ccbc 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_60.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_60.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_61.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_61.binproto
index 77c095009a..4227445e68 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_61.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_61.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_62.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_62.binproto
index 76703d1c02..3d14bdebaa 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_62.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_62.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_63.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_63.binproto
index a75bfe5d97..5ebf7f42a7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_63.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_63.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_64.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_64.binproto
index 803ea0d907..cf7afcb866 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_64.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_64.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_65.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_65.binproto
index 413a101cee..0bdace2286 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_65.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_65.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_66.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_66.binproto
index 2580719632..4a0c2bf78a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_66.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_66.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_67.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_67.binproto
index ed1af70b2c..a892445419 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_67.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_67.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_68.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_68.binproto
index 03b7e52711..73e72cdc7d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_68.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_68.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_69.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_69.binproto
index ed1af70b2c..a892445419 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_69.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_69.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_70.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_70.binproto
index b631818523..5223ab22b5 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_70.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_70.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_71.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_71.binproto
index a25961e4e2..7b503c4959 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_71.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_71.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_72.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_72.binproto
index 0d87f01d43..dc26a25cc0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_72.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_72.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_73.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_73.binproto
index 5b4533a7c8..404c214077 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_73.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_73.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_74.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_74.binproto
index c6f5b155de..e256f1c7b0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_74.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_74.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_75.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_75.binproto
index 5a63cd88fb..53500b2811 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_75.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_75.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_76.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_76.binproto
index f33084c970..25e86c83e6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_76.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_76.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_77.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_77.binproto
index f83fd76a7f..ba06693d10 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_77.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_77.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_78.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_78.binproto
index 04a6a8ad4f..263240ae77 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_78.binproto and b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_78.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_pin_message_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_pin_message_update_00.binproto
index 24e6913110..458e0635ba 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_pin_message_update_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_pin_message_update_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_pin_message_update_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_pin_message_update_01.binproto
index 7be9c98235..e81c3efdfa 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_pin_message_update_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_pin_message_update_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_pin_message_update_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_pin_message_update_02.binproto
index f6583d6e4e..726b84436e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_pin_message_update_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_pin_message_update_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_00.binproto
index 47170797c1..dd85055f91 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_01.binproto
index c6191e193f..bae7ec1873 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_02.binproto
index f50e0bb329..730d9be9cc 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_03.binproto
index 7d7ee1e63d..c53e6ffc94 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_04.binproto
index df8adcc4c5..693103c967 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_05.binproto
index e55cc0fd5c..b526072731 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_06.binproto
index 6fba86bf7d..ff4f86a188 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_07.binproto
index b9ffca9fd1..177ce9097c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_08.binproto
index 1d867e63bc..6160bfe9ad 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_09.binproto
index 5aaae61fa4..a4967e7dc7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_10.binproto
index cb05b0a93b..d16298b7f7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_11.binproto
index ff5f5d4dff..121b3c046f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_12.binproto
index 5f228f1d4b..df6764fddf 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_13.binproto
index 5b5d3e6e39..80ff9e99c5 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_14.binproto
index 406b10c706..ed7fa8cbe2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_00.binproto
index 8086f5ab89..3e3038b9a0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_01.binproto
index 3509499a7d..5779fc8c2b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_02.binproto
index 4d326137fd..aab04c2d3a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_03.binproto
index f02025321e..60fa856ce0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_04.binproto
index af84cf0b95..b78102640a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_05.binproto
index 989123086f..344cbf88e4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_06.binproto
index 8a2c70efb4..e15871f7a9 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_07.binproto
index 83857ceaff..8c68245565 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_08.binproto
index 690b7e0aa8..6d6dbbcb6e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_09.binproto
index 76bf28fc44..f5d0789ecc 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_10.binproto
index a29ccc6c8c..2d8fa84a9a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_11.binproto
index fabaeefd32..dfa46ab4ff 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_12.binproto
index f01e9b5dea..9390f705fe 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_13.binproto
index 660fa61ca6..113f350f9f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_14.binproto
index 2aee434729..bbf2bdffd7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_15.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_15.binproto
index 113b4c65e0..7dd8f36974 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_15.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_15.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_16.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_16.binproto
index 297ba2736d..2dece76330 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_16.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_16.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_17.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_17.binproto
index 75374ac7c2..cb53f5492c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_17.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_17.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_terminate_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_terminate_update_00.binproto
index 54ce74667b..2c4ae697be 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_terminate_update_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_terminate_update_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_terminate_update_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_terminate_update_01.binproto
index a909a24bb0..5d338710e2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_terminate_update_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_terminate_update_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_00.binproto
index b88290bb1c..beec376862 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_01.binproto
index 3c58665ec1..24df64ade5 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_02.binproto
index 487587c530..5a77e31430 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_03.binproto
index a5e5a3de85..7a44974c04 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_04.binproto
index 1ce128e39c..59e7e080d9 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_05.binproto
index a9ad0b53bc..5b20a6b7ab 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_06.binproto
index 38267966f8..8e673d71f0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_07.binproto
index 95c91ad2e3..52a35ee8f4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_08.binproto
index c0b99d9aec..824864924f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_09.binproto
index 2c7b9ba119..b88ed4050e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_10.binproto
index 0e1d502080..efc689a745 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_11.binproto
index 040626922f..e52c2fbbc4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_12.binproto
index 2e0d3de66a..453c70def2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_13.binproto
index db2ab483d3..63063e608a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_14.binproto
index b1616de1cb..1e2b8d5b09 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_formatted_text_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_00.binproto
index f1e7e6fcef..de601a7d4a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_01.binproto
index 7088a0f442..294f34a3ec 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_02.binproto
index 8abe78c2aa..87c36581d7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_03.binproto
index f261084abc..c10ad402c6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_04.binproto
index 510c1d55df..01b6d53fdb 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_05.binproto
index af03fd584c..02bef2c8b6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_06.binproto
index e15ec74d6b..5c57efb278 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_07.binproto
index 9c96a3adf8..790303a0f8 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_08.binproto
index aa415641d9..953761f107 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_09.binproto
index b99bccf3f8..eee1302d48 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_10.binproto
index cc9c17191a..acb2f14384 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_11.binproto
index 16dd32b9b7..e3a8402767 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_12.binproto
index d9c1dab997..6087d5ca1f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_13.binproto
index 635d826bb8..d70aa31aad 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_14.binproto
index f031a8085a..d244e55446 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_group_text_only_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_00.binproto
index a421620239..16d9fbbab4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_01.binproto
index 2d5b516816..7ea3495275 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_02.binproto
index 3630c316de..629d56a764 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_03.binproto
index d8b557a25c..b0a2a9069d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_04.binproto
index b1ff93e059..3b2103d4c5 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_05.binproto
index 91e36afe3b..c8a567d938 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_06.binproto
index 73cbd540a5..6c9bc056b1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_07.binproto
index 4ad1985a02..dcf31746dc 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_08.binproto
index 636eece4ec..10548764e8 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_09.binproto
index cb3fe7f55b..0f0a25bcf4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_10.binproto
index 52816c0f94..42302916e1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_11.binproto
index ffb7e191dc..cf6098a1d4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_12.binproto
index dae3619969..b3ef373a5d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_13.binproto
index a126e68206..4923d342ed 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_14.binproto
index ba60cc6616..8126b47ed1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_00.binproto b/app/src/androidTest/assets/backupTests/notification_profile_00.binproto
index 41862a6ce1..1a1cd7b7f3 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_00.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_01.binproto b/app/src/androidTest/assets/backupTests/notification_profile_01.binproto
index 51e8d8ce5c..1c65284f36 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_01.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_02.binproto b/app/src/androidTest/assets/backupTests/notification_profile_02.binproto
index 88d2ccdc57..5d6ad60bc5 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_02.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_03.binproto b/app/src/androidTest/assets/backupTests/notification_profile_03.binproto
index 6db27810b9..687d15b4ae 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_03.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_04.binproto b/app/src/androidTest/assets/backupTests/notification_profile_04.binproto
index e76061ad7d..a6d04e2015 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_04.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_05.binproto b/app/src/androidTest/assets/backupTests/notification_profile_05.binproto
index 6641f64112..0b26427369 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_05.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_06.binproto b/app/src/androidTest/assets/backupTests/notification_profile_06.binproto
index 515880273f..ebf8b6d569 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_06.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_07.binproto b/app/src/androidTest/assets/backupTests/notification_profile_07.binproto
index 36c5164b10..4eb6550d74 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_07.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_08.binproto b/app/src/androidTest/assets/backupTests/notification_profile_08.binproto
index 579120a03b..c54b6b2949 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_08.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_09.binproto b/app/src/androidTest/assets/backupTests/notification_profile_09.binproto
index 191db65471..e0d9ccf5f2 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_09.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_10.binproto b/app/src/androidTest/assets/backupTests/notification_profile_10.binproto
index ca52255ba7..caeaf08d08 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_10.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_11.binproto b/app/src/androidTest/assets/backupTests/notification_profile_11.binproto
index 086f71f3f5..8d0ffa01bb 100644
Binary files a/app/src/androidTest/assets/backupTests/notification_profile_11.binproto and b/app/src/androidTest/assets/backupTests/notification_profile_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_01.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_01.binproto
index 577f68a366..0bbe7da29e 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_01.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_03.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_03.binproto
index 907aef14b6..6e4e494e23 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_03.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_05.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_05.binproto
index 9c8cccfc29..c8ffcf9607 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_05.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_07.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_07.binproto
index 577f68a366..0bbe7da29e 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_07.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_09.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_09.binproto
index 907aef14b6..6e4e494e23 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_09.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_11.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_11.binproto
index 9c8cccfc29..c8ffcf9607 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_11.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_13.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_13.binproto
index 577f68a366..0bbe7da29e 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_13.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_call_link_15.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_15.binproto
index 907aef14b6..6e4e494e23 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_15.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_15.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_00.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_00.binproto
index ae6049a22f..132937538a 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_00.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_01.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_01.binproto
index 7262c9df4f..8443932d98 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_01.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_02.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_02.binproto
index dc77758be1..d5a76db9f7 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_02.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_03.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_03.binproto
index feb69841a6..3f13df046b 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_03.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_04.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_04.binproto
index 02b88915ac..9b1b05dea4 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_04.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_05.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_05.binproto
index a684165526..fbb961679e 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_05.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_06.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_06.binproto
index 80535c55d3..ac1b5ec1c3 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_06.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_07.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_07.binproto
index 194750b17c..5f80a65756 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_07.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_08.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_08.binproto
index e9681459ca..9ad149e775 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_08.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_09.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_09.binproto
index 906ebfb82b..0ab9d061be 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_09.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_10.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_10.binproto
index b6e89deb41..2612c661fe 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_10.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_11.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_11.binproto
index ae07346486..4121043083 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_groups_11.binproto and b/app/src/androidTest/assets/backupTests/recipient_groups_11.binproto differ
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/GroupArchiveExporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/GroupArchiveExporter.kt
index 0dde9b5a82..bd5a19f42c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/GroupArchiveExporter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/GroupArchiveExporter.kt
@@ -111,7 +111,12 @@ private fun AccessControl.AccessRequired.toRemote(): Group.AccessControl.AccessR
 }
 
 private fun AccessControl.toRemote(): Group.AccessControl {
-  return Group.AccessControl(members = members.toRemote(), attributes = attributes.toRemote(), addFromInviteLink = addFromInviteLink.toRemote())
+  return Group.AccessControl(
+    members = members.toRemote(),
+    attributes = attributes.toRemote(),
+    addFromInviteLink = addFromInviteLink.toRemote(),
+    memberLabel = memberLabel.toRemote()
+  )
 }
 
 private fun Member.Role.toRemote(): Group.Member.Role {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/GroupArchiveImporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/GroupArchiveImporter.kt
index fae6882b2f..e8ce59f822 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/GroupArchiveImporter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/GroupArchiveImporter.kt
@@ -104,7 +104,12 @@ private fun Group.AccessControl.AccessRequired.toLocal(): AccessControl.AccessRe
 }
 
 private fun Group.AccessControl.toLocal(): AccessControl {
-  return AccessControl(members = this.members.toLocal(), attributes = this.attributes.toLocal(), addFromInviteLink = this.addFromInviteLink.toLocal())
+  return AccessControl(
+    members = this.members.toLocal(),
+    attributes = this.attributes.toLocal(),
+    addFromInviteLink = this.addFromInviteLink.toLocal(),
+    memberLabel = this.memberLabel.toLocal()
+  )
 }
 
 private fun Group.Member.Role.toLocal(): Member.Role {
diff --git a/app/src/main/protowire/Backup.proto b/app/src/main/protowire/Backup.proto
index 45e782424c..ae21f362c2 100644
--- a/app/src/main/protowire/Backup.proto
+++ b/app/src/main/protowire/Backup.proto
@@ -365,6 +365,7 @@ message Group {
     AccessRequired attributes = 1;
     AccessRequired members = 2;
     AccessRequired addFromInviteLink = 3;
+    AccessRequired memberLabel = 4;
   }
 }
 
@@ -1075,6 +1076,7 @@ message GroupChangeChatUpdate {
       GroupV2MigrationDroppedMembersUpdate groupV2MigrationDroppedMembersUpdate = 32;
       GroupSequenceOfRequestsAndCancelsUpdate groupSequenceOfRequestsAndCancelsUpdate = 33;
       GroupExpirationTimerUpdate groupExpirationTimerUpdate = 34;
+      GroupMemberLabelAccessLevelChangeUpdate groupMemberLabelAccessLevelChangeUpdate = 35;
     }
   }
 
@@ -1126,6 +1128,11 @@ message GroupAttributesAccessLevelChangeUpdate {
   GroupV2AccessLevel accessLevel = 2;
 }
 
+message GroupMemberLabelAccessLevelChangeUpdate {
+  optional bytes updaterAci = 1;
+  GroupV2AccessLevel accessLevel = 2;
+}
+
 message GroupAnnouncementOnlyChangeUpdate {
   optional bytes updaterAci = 1;
   bool isAnnouncementOnly = 2;