diff --git a/app/src/androidTest/assets/backupTests/account_data_00.binproto b/app/src/androidTest/assets/backupTests/account_data_00.binproto
index 5b1f300b37..96e14f0da9 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_00.binproto and b/app/src/androidTest/assets/backupTests/account_data_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_01.binproto b/app/src/androidTest/assets/backupTests/account_data_01.binproto
index 9efadaf3cf..3982fc0ed1 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_01.binproto and b/app/src/androidTest/assets/backupTests/account_data_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_02.binproto b/app/src/androidTest/assets/backupTests/account_data_02.binproto
index 5243175092..9ad096e592 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_02.binproto and b/app/src/androidTest/assets/backupTests/account_data_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_03.binproto b/app/src/androidTest/assets/backupTests/account_data_03.binproto
index 2dcdfc70eb..b73f74d586 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_03.binproto and b/app/src/androidTest/assets/backupTests/account_data_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_04.binproto b/app/src/androidTest/assets/backupTests/account_data_04.binproto
index ac719d3ffd..2cf8511ee7 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_04.binproto and b/app/src/androidTest/assets/backupTests/account_data_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_05.binproto b/app/src/androidTest/assets/backupTests/account_data_05.binproto
index 29f9bb9e56..c6765718c3 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_05.binproto and b/app/src/androidTest/assets/backupTests/account_data_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_06.binproto b/app/src/androidTest/assets/backupTests/account_data_06.binproto
index 7aa0a2648e..a5e0a552c2 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_06.binproto and b/app/src/androidTest/assets/backupTests/account_data_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_07.binproto b/app/src/androidTest/assets/backupTests/account_data_07.binproto
index c7527e5724..bdef273e6d 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_07.binproto and b/app/src/androidTest/assets/backupTests/account_data_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_08.binproto b/app/src/androidTest/assets/backupTests/account_data_08.binproto
index 0ecc36329c..2946755f00 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_08.binproto and b/app/src/androidTest/assets/backupTests/account_data_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_09.binproto b/app/src/androidTest/assets/backupTests/account_data_09.binproto
index fb075c58dd..41597c4812 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_09.binproto and b/app/src/androidTest/assets/backupTests/account_data_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_10.binproto b/app/src/androidTest/assets/backupTests/account_data_10.binproto
index c23f9b5143..2519b026e6 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_10.binproto and b/app/src/androidTest/assets/backupTests/account_data_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_11.binproto b/app/src/androidTest/assets/backupTests/account_data_11.binproto
index 525714c6ca..a172e0b945 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_11.binproto and b/app/src/androidTest/assets/backupTests/account_data_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_12.binproto b/app/src/androidTest/assets/backupTests/account_data_12.binproto
index 142d17ce5f..3156f1772b 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_12.binproto and b/app/src/androidTest/assets/backupTests/account_data_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_13.binproto b/app/src/androidTest/assets/backupTests/account_data_13.binproto
index f6f4c49124..c9b55f0628 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_13.binproto and b/app/src/androidTest/assets/backupTests/account_data_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_14.binproto b/app/src/androidTest/assets/backupTests/account_data_14.binproto
index 1a8b84e11f..fb7b279d9f 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_14.binproto and b/app/src/androidTest/assets/backupTests/account_data_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_15.binproto b/app/src/androidTest/assets/backupTests/account_data_15.binproto
index db1bec54eb..f7d589b0ec 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_15.binproto and b/app/src/androidTest/assets/backupTests/account_data_15.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_16.binproto b/app/src/androidTest/assets/backupTests/account_data_16.binproto
index 3d22ff4d1c..77c9cf779b 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_16.binproto and b/app/src/androidTest/assets/backupTests/account_data_16.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_17.binproto b/app/src/androidTest/assets/backupTests/account_data_17.binproto
index 2c2a983d8f..0d57808a3c 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_17.binproto and b/app/src/androidTest/assets/backupTests/account_data_17.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_18.binproto b/app/src/androidTest/assets/backupTests/account_data_18.binproto
index 9e39179db3..17e253c258 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_18.binproto and b/app/src/androidTest/assets/backupTests/account_data_18.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_19.binproto b/app/src/androidTest/assets/backupTests/account_data_19.binproto
index 4867291599..b82d80d5cd 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_19.binproto and b/app/src/androidTest/assets/backupTests/account_data_19.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_20.binproto b/app/src/androidTest/assets/backupTests/account_data_20.binproto
index 9cf0291b76..a4b98e0375 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_20.binproto and b/app/src/androidTest/assets/backupTests/account_data_20.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_21.binproto b/app/src/androidTest/assets/backupTests/account_data_21.binproto
index d35cdaaea9..0b965123c6 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_21.binproto and b/app/src/androidTest/assets/backupTests/account_data_21.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_22.binproto b/app/src/androidTest/assets/backupTests/account_data_22.binproto
index 042b673216..ba2e658109 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_22.binproto and b/app/src/androidTest/assets/backupTests/account_data_22.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_23.binproto b/app/src/androidTest/assets/backupTests/account_data_23.binproto
index 18dc805744..a919839fb5 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_23.binproto and b/app/src/androidTest/assets/backupTests/account_data_23.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_24.binproto b/app/src/androidTest/assets/backupTests/account_data_24.binproto
index 360cecf93d..7dbb0bab79 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_24.binproto and b/app/src/androidTest/assets/backupTests/account_data_24.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_25.binproto b/app/src/androidTest/assets/backupTests/account_data_25.binproto
index 4c9bdb8b14..52acdaadb1 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_25.binproto and b/app/src/androidTest/assets/backupTests/account_data_25.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_26.binproto b/app/src/androidTest/assets/backupTests/account_data_26.binproto
index af35ec61df..0ea9df26b9 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_26.binproto and b/app/src/androidTest/assets/backupTests/account_data_26.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/account_data_27.binproto b/app/src/androidTest/assets/backupTests/account_data_27.binproto
index 88e3ac4f96..6fbe499e4e 100644
Binary files a/app/src/androidTest/assets/backupTests/account_data_27.binproto and b/app/src/androidTest/assets/backupTests/account_data_27.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/ad_hoc_call_00.binproto b/app/src/androidTest/assets/backupTests/ad_hoc_call_00.binproto
index 8ebe4de398..36f43f413f 100644
Binary files a/app/src/androidTest/assets/backupTests/ad_hoc_call_00.binproto and b/app/src/androidTest/assets/backupTests/ad_hoc_call_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/ad_hoc_call_01.binproto b/app/src/androidTest/assets/backupTests/ad_hoc_call_01.binproto
index bcd7101657..5c9017477d 100644
Binary files a/app/src/androidTest/assets/backupTests/ad_hoc_call_01.binproto and b/app/src/androidTest/assets/backupTests/ad_hoc_call_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/ad_hoc_call_02.binproto b/app/src/androidTest/assets/backupTests/ad_hoc_call_02.binproto
index 33d52d4013..af2be7af06 100644
Binary files a/app/src/androidTest/assets/backupTests/ad_hoc_call_02.binproto and b/app/src/androidTest/assets/backupTests/ad_hoc_call_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/android_account_data_00.binproto b/app/src/androidTest/assets/backupTests/android_account_data_00.binproto
index 8935a0df82..a979faf1cc 100644
Binary files a/app/src/androidTest/assets/backupTests/android_account_data_00.binproto and b/app/src/androidTest/assets/backupTests/android_account_data_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/android_account_data_01.binproto b/app/src/androidTest/assets/backupTests/android_account_data_01.binproto
index c4573062ea..f212011c5e 100644
Binary files a/app/src/androidTest/assets/backupTests/android_account_data_01.binproto and b/app/src/androidTest/assets/backupTests/android_account_data_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_00.binproto b/app/src/androidTest/assets/backupTests/chat_00.binproto
index 9c0dd67963..c45a39bb2e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_00.binproto and b/app/src/androidTest/assets/backupTests/chat_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_01.binproto b/app/src/androidTest/assets/backupTests/chat_01.binproto
index 4a816e42e0..01125b44dd 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_01.binproto and b/app/src/androidTest/assets/backupTests/chat_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_02.binproto b/app/src/androidTest/assets/backupTests/chat_02.binproto
index fdb4d507ff..987684872e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_02.binproto and b/app/src/androidTest/assets/backupTests/chat_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_03.binproto b/app/src/androidTest/assets/backupTests/chat_03.binproto
index 8ea17fb2d8..aa8f656b1e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_03.binproto and b/app/src/androidTest/assets/backupTests/chat_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_04.binproto b/app/src/androidTest/assets/backupTests/chat_04.binproto
index 388c051dd8..a20048113e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_04.binproto and b/app/src/androidTest/assets/backupTests/chat_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_05.binproto b/app/src/androidTest/assets/backupTests/chat_05.binproto
index 5c58711872..567ed7e432 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_05.binproto and b/app/src/androidTest/assets/backupTests/chat_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_06.binproto b/app/src/androidTest/assets/backupTests/chat_06.binproto
index 527ccb4ec7..3496a4cdba 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_06.binproto and b/app/src/androidTest/assets/backupTests/chat_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_07.binproto b/app/src/androidTest/assets/backupTests/chat_07.binproto
index abce738158..c67b107f3e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_07.binproto and b/app/src/androidTest/assets/backupTests/chat_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_08.binproto b/app/src/androidTest/assets/backupTests/chat_08.binproto
index f5216247a3..0b0616d107 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_08.binproto and b/app/src/androidTest/assets/backupTests/chat_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_09.binproto b/app/src/androidTest/assets/backupTests/chat_09.binproto
index 65a0b7db20..0b8c94e844 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_09.binproto and b/app/src/androidTest/assets/backupTests/chat_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_10.binproto b/app/src/androidTest/assets/backupTests/chat_10.binproto
index e634b41a2f..c195d5ec99 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_10.binproto and b/app/src/androidTest/assets/backupTests/chat_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_11.binproto b/app/src/androidTest/assets/backupTests/chat_11.binproto
index b8e83f1904..cc3a9108d4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_11.binproto and b/app/src/androidTest/assets/backupTests/chat_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_12.binproto b/app/src/androidTest/assets/backupTests/chat_12.binproto
index 17abeb2645..85f53dc56a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_12.binproto and b/app/src/androidTest/assets/backupTests/chat_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_13.binproto b/app/src/androidTest/assets/backupTests/chat_13.binproto
index 7d667d1da7..3931520086 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_13.binproto and b/app/src/androidTest/assets/backupTests/chat_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_14.binproto b/app/src/androidTest/assets/backupTests/chat_14.binproto
index 01ce5a866d..cc0cb362b5 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_14.binproto and b/app/src/androidTest/assets/backupTests/chat_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_15.binproto b/app/src/androidTest/assets/backupTests/chat_15.binproto
index 2011d248bc..c19b7c8315 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_15.binproto and b/app/src/androidTest/assets/backupTests/chat_15.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_16.binproto b/app/src/androidTest/assets/backupTests/chat_16.binproto
index 0ab9119b61..2ef56c45b2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_16.binproto and b/app/src/androidTest/assets/backupTests/chat_16.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_17.binproto b/app/src/androidTest/assets/backupTests/chat_17.binproto
index c72a252a2e..b03fb92a91 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_17.binproto and b/app/src/androidTest/assets/backupTests/chat_17.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_18.binproto b/app/src/androidTest/assets/backupTests/chat_18.binproto
index 80d5cd95ee..ea5f8567c9 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_18.binproto and b/app/src/androidTest/assets/backupTests/chat_18.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_19.binproto b/app/src/androidTest/assets/backupTests/chat_19.binproto
index 7225d74d8c..5bfa29cca3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_19.binproto and b/app/src/androidTest/assets/backupTests/chat_19.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_20.binproto b/app/src/androidTest/assets/backupTests/chat_20.binproto
index b651bf88b2..4d80dd99fc 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_20.binproto and b/app/src/androidTest/assets/backupTests/chat_20.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_21.binproto b/app/src/androidTest/assets/backupTests/chat_21.binproto
index 604b5a1743..b61a0cd72b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_21.binproto and b/app/src/androidTest/assets/backupTests/chat_21.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_22.binproto b/app/src/androidTest/assets/backupTests/chat_22.binproto
index 756795ee70..d3c78fd8b8 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_22.binproto and b/app/src/androidTest/assets/backupTests/chat_22.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_23.binproto b/app/src/androidTest/assets/backupTests/chat_23.binproto
index c03782d297..1a15e5b01d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_23.binproto and b/app/src/androidTest/assets/backupTests/chat_23.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_24.binproto b/app/src/androidTest/assets/backupTests/chat_24.binproto
index 136c013a52..5ede45bddd 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_24.binproto and b/app/src/androidTest/assets/backupTests/chat_24.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_25.binproto b/app/src/androidTest/assets/backupTests/chat_25.binproto
index 5fe216abeb..c1408b835a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_25.binproto and b/app/src/androidTest/assets/backupTests/chat_25.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_26.binproto b/app/src/androidTest/assets/backupTests/chat_26.binproto
index 9c6a9366b5..8ef1917b2d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_26.binproto and b/app/src/androidTest/assets/backupTests/chat_26.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_folder_00.binproto b/app/src/androidTest/assets/backupTests/chat_folder_00.binproto
index cb6c44f701..7b5b3b3d9f 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 80f72dea77..88a7c9e46e 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 ef6710f5c3..8d23d3add4 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 d4d37e7bc5..2856ba78cf 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_contact_message_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_00.binproto
index e8d1203c3d..11692d6677 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_01.binproto
index d1c6d0dc86..0c16a13e0f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_02.binproto
index e644782f7b..7c5d596003 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_03.binproto
index 15dee4a55f..d8273d83fc 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_04.binproto
index 09ea9a1268..82a12b51cb 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_05.binproto
index ec9d987de5..40d72be80f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_06.binproto
index 88e97788aa..0762254e99 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_07.binproto
index 916cd05fa9..71188c1d2f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_08.binproto
index 8e167b44b1..bf60aa77ed 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_09.binproto
index 4ca9ba3e1c..204716fa8f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_10.binproto
index eaba0d0e12..450fbf7199 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_11.binproto
index d432e4b4b6..7b1615e168 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_12.binproto
index f4c8c63314..4e678b98e5 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_13.binproto
index 22e21567fb..7494805492 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_contact_message_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_contact_message_14.binproto
index f969ca3c2c..20663cef31 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_contact_message_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_contact_message_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_00.binproto
index 0223a19f2d..95c3c6d99e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_01.binproto
index f1e266a088..839f26b839 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_02.binproto
index 326571366e..bb497404bd 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_03.binproto
index f86eadddfa..cb4389c848 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_04.binproto
index fd505b05db..0634567f0f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_05.binproto
index 024124ab01..6d0a7e870a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_06.binproto
index 021dab1f83..86f10c6100 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_07.binproto
index 8be9fe1b9f..0787bb3a25 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_08.binproto
index 68dd64ce4d..94da89c778 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_09.binproto
index 647eea49ca..f8a5c6ded1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_10.binproto
index 691c27ea0b..32f26a51bf 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_11.binproto
index 060036f631..904828045d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_12.binproto
index 2bdd2905ef..822b2d826c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_13.binproto
index fb2c4c83db..34e22e4854 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_14.binproto
index c0956125f8..01a8fc673d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_00.binproto
index 03edd8c4f2..83420a67e1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_01.binproto
index 2ef08a0a98..9348928c28 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_02.binproto
index a5d3a93233..b0a0d2aaf1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_03.binproto
index 530034196f..953507ab9d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_04.binproto
index 60867e13dd..84b7a991a3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_05.binproto
index 6da98923df..cb0010340d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_06.binproto
index 78bdd78e2b..6f0334f1a3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_07.binproto
index 14033143c8..46f88dce04 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_08.binproto
index d71c52eb57..a4bc18ba8f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_09.binproto
index 39e862a8c7..a4635c46be 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_10.binproto
index a3163ea0f6..6e9b36ef13 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_00.binproto
index e772feadb4..796df7110d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_01.binproto
index 7141694b10..e79287dd19 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_02.binproto
index b4bb5f2863..589bdadacf 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_00.binproto
index 64177b3d85..dc3a1d41b3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_01.binproto
index ea8b039b48..987aef3e61 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_02.binproto
index c28da503ab..27143a6339 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_03.binproto
index 9ce1e93658..e9bc3b5f62 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_04.binproto
index 1106e69f70..8b0f240abb 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_05.binproto
index 0f6c287fb5..61326abe17 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_06.binproto
index 682f941c9e..26743ae31a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_07.binproto
index 70bc63a469..b9ec8a1574 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_08.binproto
index df00278c82..3a56fe223a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_09.binproto
index a54dd44066..fabc2f8a09 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_10.binproto
index eba754851a..a6cd1a4fb8 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_11.binproto
index 30766ca4e8..88056cefe4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_12.binproto
index 41863c5c45..63677c340f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_13.binproto
index 6a99e48f52..57976dcd45 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_14.binproto
index 7f7d67ece2..cc4418d952 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_gift_badge_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_gift_badge_14.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 5c4fa4c364..ff0af33cfc 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 1f76dd04bc..e08f1f38b1 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 2c323d0c60..bd22a07502 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 f2b826d9ff..5fb50a87cd 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 f75077a849..d23b726c25 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 86f378b8e8..b05888d62a 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 a74a74014d..2a3eda451e 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 9e8f5b7a32..bc44560922 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 3d6ba1e891..725139469b 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 9f372bbab4..0a73dfee75 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 9021bb2880..e60879278d 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 2f11eb9587..483330cf13 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 0cdb0c4669..da6b119c83 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 509b1bc4da..40341bbe0d 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 fd2b50b75c..43a0184475 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 30ad2deb6d..20c1446578 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 f1e364765b..d76db6727e 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 5dda8bb2db..e58c7b104d 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 0fcd6af3c9..c5307d4198 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 3da0e5ad33..3308cb4b14 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 b96fd90ef0..a4f264c350 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 8b74954ffe..6ccb103db3 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 928076c35f..893e900672 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 9507c6578d..4b37db02be 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 6f86d9956b..3d6e6eddb1 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 b194fd11ab..432e139ad1 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 c56e0ca519..1276ab76d5 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 d33349e884..bf8b64f8bb 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 d2a81d1f4e..bee7aa4158 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 5df6df5259..11f054261c 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 df787518c6..33e05df740 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 dd02c1734a..7e18c1c5fd 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 3f916905f0..5fd1b06943 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 d192d98de8..492cb40fde 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 506c3a61cb..62100bd709 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 3fb6b34068..a32b1e7ae0 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 2e96326cc3..221398de17 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 3e7df9433a..6c3c651261 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 6b430c4746..610c34b388 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 46e723f013..02465f2512 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 75b298548d..5673572de9 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 1d6bde378a..c3050950d5 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 66063d4800..0f7d0fc359 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 858774759e..4ac421065b 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 3d551139ad..29ca215225 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 87c618a4dc..97c2c15a9f 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 0f15a3ac1e..81ba0b4358 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 2da8502a88..63517d605b 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 82a6079979..91060782df 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 6027a42661..faf6cb8422 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 e9b1202cfe..f39483305c 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 d229d376b1..27e324c51a 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 8215bf1c4a..bf2bd078e4 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 75cad2d1e4..6a992b6da9 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 2d93bbf9e3..af7f0b63b9 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 663ef0f132..371ea02f52 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 725cf2d0c7..ee7a0d4b9c 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 d14d88403c..eada1df379 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 3bcb95962a..7d8294d67c 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 d14d88403c..eada1df379 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 b92396990f..e453534aa0 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 ef42cd57ec..3fd5def565 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 c876ddfb31..0700063fab 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 f20d392004..9ef4dfea9c 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 e524fc97e8..c2313947ab 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 bd43fb3f82..06953f7439 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 215523f056..11600f4e98 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 076969224c..b2b22b7fa7 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 8bac5da179..80c4684c89 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 cdc1a390bf..a211887b2c 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 e4186cf6eb..0bbb4b512f 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 d818cad702..f3afb3de19 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 09498c657f..5b93e33bf6 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 6f6919f34c..a167b1175a 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 0e4a4dd68b..1fe6fd9983 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 9f3105c6f0..045712473f 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 be45962e12..9223ba91af 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 f588701376..f6cfb6e4f7 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 594ee8cc6d..8c5149f52f 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 b1b81ddee5..3c082ed642 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 79e1700afd..9e164ea335 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 0ee24164db..213785d41a 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 2090ad5d1e..953864982e 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 e757693a0b..98224f14c5 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 f503665ccc..a5e8fab2f1 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 2218e571fe..afe22961d8 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 51263ec550..241f6bafd7 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 c9834e3fb3..09cc313474 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 ad4ab070e0..a88b9f6b40 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 6ee8ec1ba5..56cc28951c 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 c9c3295ae6..9944e45e6e 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 f5d5158cd2..b20936ec91 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 7cbfcc08f1..10a301575f 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 3f68767d53..903022f733 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 7cbfcc08f1..10a301575f 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 b519d6b42f..abb53ba38c 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 5c90bdd218..cfcaa6e5f4 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 be67e3f02b..74a78b1613 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 2958ea39cc..5c43ea8a9e 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 9d0ac69a54..af086dc17d 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 10f62790c4..bfa7935945 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 974dacfc37..0d5c0ef0a6 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 90c6f5f784..d641a41237 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 da581c10fe..0dfb9849ea 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_individual_call_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_00.binproto
index ba6dfae417..839f43fc70 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_01.binproto
index 4f082828a3..634111488c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_02.binproto
index afbab6aa5b..5f6a158110 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_03.binproto
index ef7c5da51d..2fa50331a3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_00.binproto
index 82d58acf01..b0c47f94c1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_01.binproto
index 8ee9016a3a..93525232a2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_02.binproto
index 93471b0fc6..b2aad4fd9a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_03.binproto
index ee8bd1077a..f6c9c839bc 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_04.binproto
index ed350c9797..d16fb2a0e1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_learned_profile_update_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_00.binproto
index 9cf1ddeccc..484d0d57a6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_01.binproto
index 08a32abc94..e62ea7242f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_02.binproto
index 04522d0bb6..a30f3980aa 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_03.binproto
index 6a537920ac..8f53ce7a82 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_04.binproto
index 813342fb6e..95c1f2d582 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_05.binproto
index 9c6839387f..1f57b740e3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_06.binproto
index de1be1474a..8300686944 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_07.binproto
index 39f565ec06..67fc3571b4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_08.binproto
index a05ccc0f64..973e22fe7c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_09.binproto
index 662263654a..25dc9296b2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_10.binproto
index c11b5b8da7..bbe1c5c37d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_11.binproto
index 5e3ffb04b2..eda455418d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_12.binproto
index 14496714b2..5c69c3747d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_13.binproto
index 23493960c1..a0f6889458 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_14.binproto
index b4b0abd9a6..91f2cd6830 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_payment_notification_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_payment_notification_14.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 719563ed5d..4e45520ad0 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 a5cfd06c44..79bc59cdf4 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 2306fe2606..3c57be6844 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 f68ef274ad..6e44ade04b 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 13ed67f388..8193fefa91 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 196a0fae0e..1258a81b9f 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 fa386d346b..6691408e3f 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 5ca1f8055e..f143fb52db 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 8ebb2f159e..b77cd1a087 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 275440ab02..14f5856bb6 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 2d7173644c..860aebceab 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 384efdf0f7..a13ef76657 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 44192d6464..16b1929385 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 74704084a1..3e78bac708 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 23d97e83f3..4c6a72ca75 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 5f0a36d0e9..979de33e3e 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 8a53387743..50f98b2d37 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 c6fdad536f..0fe7e04867 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 8cda42b19c..1d50bd3a1e 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 9722e7aa96..e0bca9ccd3 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 7e1df4e30f..1cb4e269f6 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 ddef43c65b..49ec4286b0 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 ec00d82491..c4ff7f89a9 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 9013e8e545..83f18509ab 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 c0269b0c25..1cc30bc49b 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 e55ed6af6a..b418c2140a 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 6ec5a07af1..b867c3ef54 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 dacf87c204..89a103f657 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 fc0c4a48b5..80734afdca 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 cdd34c925e..26619f4b41 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 07c40ce16a..11fa8432d7 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 180528d8e8..55ad2183e1 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 46a2b4efb6..153cdbf418 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 5d4cedd52c..576e417d60 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 cae2af066f..0c67e1358a 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_profile_change_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_00.binproto
index 8fe2bba739..2d9eb97b57 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_01.binproto
index 7b7a18603e..eef4cb542a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_02.binproto
index 7a63db3cd9..293fbdb639 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_00.binproto
index fa4d64abed..5fdc7216ab 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_01.binproto
index 05b5a950d4..83379414dc 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_02.binproto
index dc1953a2b0..40fd15dbd7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_03.binproto
index 679335f812..3a1c4200f0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_04.binproto
index 1c11eba928..0e452be620 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_05.binproto
index 008ea1752a..d4087bc6a2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_06.binproto
index ddb7372eb4..b07cc0bae9 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_07.binproto
index 298a5d792d..1d1ad21c42 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_08.binproto
index 061b5161ca..90dda4b595 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_09.binproto
index 9dc509463d..e9a1070a3b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_10.binproto
index 5ba2adada4..5fdeaa5364 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_11.binproto
index 7646cc0a54..319103d1c6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_12.binproto
index aafa093b25..1a04e9364a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_13.binproto
index 996d4b5cd4..1e93aa0bcc 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_14.binproto
index 1e36e5cbe4..4cd8bb2737 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_remote_delete_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_remote_delete_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_session_switchover_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_session_switchover_update_00.binproto
index 90eb1780e3..6b1bd6b98a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_session_switchover_update_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_session_switchover_update_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_session_switchover_update_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_session_switchover_update_01.binproto
index 16987378d9..63b46455a5 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_session_switchover_update_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_session_switchover_update_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_00.binproto
index e2485baa44..195988235e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_01.binproto
index 5f390df288..3a4a6cbd9d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_02.binproto
index fd511c5433..3c3b8d04f5 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_03.binproto
index a1adc22f77..02b2027fd7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_04.binproto
index 3b1a3964c3..63d8f5d1cb 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_05.binproto
index 6154b68d20..500888ba2d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_06.binproto
index 0ddeb39507..1bc0b0b76d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_07.binproto
index 39468ca36b..0766829649 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_08.binproto
index 6be035ef00..7ee43ad676 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_09.binproto
index 29625d65ee..5690e3a1ee 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_10.binproto
index f7b651fc05..e248a85a06 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_11.binproto
index 647794edf5..44303f2d1a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_12.binproto
index 5fe565c2e2..959ead2381 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_13.binproto
index 6907443f92..a3eb98b067 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_14.binproto
index 918eacd4a4..868c1e5fab 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_15.binproto b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_15.binproto
index 54025f46ed..38917eb24f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_simple_updates_15.binproto and b/app/src/androidTest/assets/backupTests/chat_item_simple_updates_15.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 49f5188f15..04ad7689af 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 976d5601cd..9243541af3 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 e20e82b09b..b51e9cbab0 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 ef81f57efe..c03754c7b6 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 7ea6c833b3..096e1b9d10 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 5a7d756a84..fb7dfaf3e0 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 b9a63b601a..49ea3918d3 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 30ee8b804d..2edeaa3cba 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 73e02350b0..4e2d1919d8 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 1ca704ca45..bce166fb51 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 c58adfb9b3..43285dba7c 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 7d29527c66..2197be20b3 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 937b47cd3b..9da8739245 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 ec10d36bd1..6c78dfc934 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 4eb10f17ac..da7c460582 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 00ddb4420a..31c36263ae 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 80ecc97ccf..c92f472695 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 cb3111cd54..8a006e9a4c 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 3d5846864d..f6a9a02b9b 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 4eddaa78d1..c547d735ce 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 82543ecc4b..2b175dc91a 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 df5f2fce9d..39e637fe4d 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 4a55a3f110..8ca8a048d6 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 314bb4a885..803ef96b20 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 110912dbfe..cd76c2ad44 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 25c623b7ce..c552e4f08e 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 4fb33ec28f..06e54613d4 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 3bb106a007..0c030bc5b0 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 325a43f233..d3a12f45b0 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 d1c2cd985d..380343e53b 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_long_text_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_00.binproto
index f09df758cf..172678982f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_01.binproto
index 2f5c23d85c..d6bf6bbd34 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_02.binproto
index 785e180b30..1ad89d235b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_03.binproto
index a9affb2e86..5751cc269f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_04.binproto
index 1bcf59697c..4ccb6f9615 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_05.binproto
index 75cc26ea9f..3ed6f04e41 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_06.binproto
index 02091e0129..25404d75ec 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_07.binproto
index 67e8a28797..b1b503793e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_08.binproto
index cf3419feff..b620f8ffd2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_09.binproto
index 82050cbd2f..c7909ce0e6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_10.binproto
index 5737993f12..a9a63741a4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_11.binproto
index 0f5b647fee..8c6aee7cc4 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_12.binproto
index 72d158fe85..60505f9819 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_13.binproto
index ce94b48437..912beb2d4b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_14.binproto
index 6f24f0ef69..2bef647d9e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_00.binproto
index e48d07a14b..8166530f26 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_01.binproto
index 7437cacf5e..f65f74c9b3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_02.binproto
index ec76874bca..20e2f9e9e1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_03.binproto
index f1ec625e7b..3ba746f757 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_04.binproto
index 476e9bfc5e..2c04626733 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_05.binproto
index 75d546eaa8..4d3f4ca5d1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_06.binproto
index 522002c5d0..e312e82efc 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_07.binproto
index 3f3c6024da..89d948302c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_08.binproto
index d6c2fe1d95..849149fa5d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_09.binproto
index 82589f8626..d9ac739a14 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_10.binproto
index 2a1c26a9d2..0d959f9810 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_11.binproto
index f37ec1a9a0..cd2be53032 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_12.binproto
index b9ddd2b5b5..26f10df792 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_13.binproto
index 33dbcea0fc..a5588a5a9c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_14.binproto
index b434c28363..667d2d3d14 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_sms_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_00.binproto
index eb5522d3b8..53b6ac4e91 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_01.binproto
index abdc579307..b2e1cc2729 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_02.binproto
index af27579fd7..bbb16a8494 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_03.binproto
index dd23b7ba62..dbb7fd7480 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_04.binproto
index a84af34f44..c2445e60ce 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_05.binproto
index ebfee0458d..5d80f7ba29 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_06.binproto
index feeddacc09..10632b4225 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_07.binproto
index 1059b724a8..2229cd47f2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_08.binproto
index 1cd0955f33..48925e998a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_09.binproto
index ce5be046b3..2608914384 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_10.binproto
index f2c431c5a2..9735722459 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_11.binproto
index 3fcfb888bc..d632d18124 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_12.binproto
index 0a9a26b7a6..0273ca5134 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_13.binproto
index ab01f3dbb0..65a6508ffe 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_14.binproto
index 83b7282b24..b09bec9d90 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_special_attachments_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_00.binproto
index 1ff8db3d0c..a390049406 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_01.binproto
index da9ef6c60e..abbc9a3bae 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_02.binproto
index a57834f70f..27e513fd80 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_03.binproto
index b0fdf4fc69..ac19c142ab 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_04.binproto
index 50cff0cad6..25a2a248b2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_05.binproto
index 0ee2701e0b..08ea1ca136 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_06.binproto
index a820d77608..7f0356e2c3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_07.binproto
index 86c1e34fdf..325cf580b9 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_08.binproto
index d49b78a6c6..63a2f386b1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_09.binproto
index e8023ef926..76e8e56de0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_10.binproto
index 5c69d161e4..50b92a0082 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_11.binproto
index 3608c91233..60dfe16bb2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_12.binproto
index 692a38a97f..f564baf575 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_13.binproto
index 23ddde0d9a..cb24f0b576 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_14.binproto
index 7970dcf4be..c64b0de026 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_00.binproto
index 1ff8db3d0c..a390049406 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_01.binproto
index da9ef6c60e..abbc9a3bae 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_02.binproto
index a57834f70f..27e513fd80 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_03.binproto
index b0fdf4fc69..ac19c142ab 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_04.binproto
index 50cff0cad6..25a2a248b2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_05.binproto
index 0ee2701e0b..08ea1ca136 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_06.binproto
index a820d77608..7f0356e2c3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_07.binproto
index 86c1e34fdf..325cf580b9 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_08.binproto
index d49b78a6c6..63a2f386b1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_09.binproto
index e8023ef926..76e8e56de0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_10.binproto
index 5c69d161e4..50b92a0082 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_11.binproto
index 3608c91233..60dfe16bb2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_12.binproto
index 692a38a97f..f564baf575 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_13.binproto
index 23ddde0d9a..cb24f0b576 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_14.binproto
index 7970dcf4be..c64b0de026 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_00.binproto
index 7c56d218fb..e35c6020bc 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_01.binproto
index 56546f33a3..c2bacdc848 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_02.binproto
index c3b3f27e08..106be236fe 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_03.binproto
index 2fac9ac459..58d73403dd 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_04.binproto
index a003adb638..04567d0bbb 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_05.binproto
index 886e78a3fc..d59cdd6ec0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_06.binproto
index 59c7a0d90d..e9a9096337 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_07.binproto
index cce9398754..55dc41fd4b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_08.binproto
index 937a25ebd1..24fe0a975f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_09.binproto
index 53e54b892c..d6a3e387c8 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_10.binproto
index ed0e5be170..39920b0c21 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_11.binproto
index 1c4931dbf5..fa938c9079 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_12.binproto
index 0e4400b692..0073fb6fc7 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_13.binproto
index 3350af8319..f4edd57af9 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_14.binproto
index 81977ac673..3de985f6ad 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_00.binproto
index 9214586050..9cf352071a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_01.binproto
index 67c6c6a70d..3e830dbb7d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_02.binproto
index 205b9fa5ee..00395b0776 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_00.binproto
index a97cec4233..bbf9a0d8ff 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_01.binproto
index 9d0126ff45..1f80ea5d8e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_02.binproto
index 5df03f4af2..e9d0964356 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_03.binproto
index f57f911cd9..a71296c06f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_04.binproto
index 30cce75318..5f2ab5fc6a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_05.binproto
index 54bf0416ee..1a65ebcea8 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_06.binproto
index de549e4217..f4fbfb1fbb 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_07.binproto
index 3dedff877b..3163976eb2 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_08.binproto
index c7b831ac59..d30c37664b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_09.binproto
index 818df645ae..fe4be42936 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_10.binproto
index b6c4038024..fd4f84b644 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_11.binproto
index 5989f8980a..a8f9bd89ef 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_12.binproto
index 9440dabd38..deed174523 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_13.binproto
index 6b8cd42063..6e5f7013b3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_14.binproto
index 45889e4a54..1cb85a4d2d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_link_preview_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 7b8a594b13..95401d3846 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 5db437bbb5..e73af2dfdb 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 3b8d64817e..f1d3f25eda 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 354031d873..3611827771 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 1263446be9..701723e7e4 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 fb7d07b527..996844086c 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 30fdb003ff..aa2f5a02c2 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 8660746a09..227c01c831 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 0dcd4b483d..312168bb43 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 eabd337b4b..6df51e5a96 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 ae78d13378..f39b1552fd 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 b006f9bb28..64bf86ccba 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 779458e996..8c1d58c2cc 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 0423a48cfa..05059c5336 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 9e5722ca51..04be33c113 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/chat_item_sticker_message_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_00.binproto
index 74a35aa5c1..17b17d4631 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_01.binproto
index f321167089..277be556b3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_02.binproto
index 05d29e5528..e047366310 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_03.binproto
index 25ee3f68b4..b8db11bd65 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_04.binproto
index 9f26d56d51..46835fc218 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_05.binproto
index e91ae4c06e..322a3806c8 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_06.binproto
index d4e4cbb103..9e776d9291 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_07.binproto
index 41d6e3b154..0012f13688 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_08.binproto
index 74a006ab92..bff67eda68 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_09.binproto
index af3ad1117b..313f7dbc09 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_10.binproto
index 2d63a2accd..0a34267fa9 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_11.binproto
index 50d32352f0..024ae236f3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_12.binproto
index 38f9305fb9..0e1b4b8346 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_13.binproto
index 3fad31e48f..c42cb06154 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_14.binproto
index 8a0774ecb1..192330dc4f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_thread_merge_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_thread_merge_update_00.binproto
index c6ae34f4bb..1644a7a02e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_thread_merge_update_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_thread_merge_update_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_thread_merge_update_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_thread_merge_update_01.binproto
index fb0adde86a..22dc0db47d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_thread_merge_update_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_thread_merge_update_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_00.binproto
index 13673d4a1b..97873ad541 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_01.binproto
index 92ebeac9d8..e82ea20aac 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_02.binproto
index 70b5886312..5ea7e93563 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_03.binproto
index 393576c64a..45f160fae1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_04.binproto
index 96ef6023f2..b3568df43d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_05.binproto
index 0468ae85e4..150ce96054 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_06.binproto
index 318d333885..51c7925410 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_07.binproto
index 2845372230..b7d3076904 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_08.binproto
index f764c65753..5f9fd88c66 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_09.binproto
index 59a3f89c43..6e1c40afc6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_10.binproto
index 182c9a9f9d..ddc8257d34 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_11.binproto
index 35f719230a..7add28685e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_12.binproto
index e58cf3b7e9..91aacc147a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_12.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 14aaf8205e..befbee8ed1 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 49424bb15c..d64ca63c53 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 7369179d5a..4082d10a24 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 b726ee6793..ed65ef67cf 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 a19490a7fa..388820f9af 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 04a8ccd515..ceb39d2232 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 e03712fb73..3017be8a80 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 b13fc4839c..3600362a73 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 7ebf822914..240e7b0186 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 85045f6a78..36f2c4100d 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 4799a14ed7..f1dbbec923 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 6cb4597b4b..61cbae7494 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_00.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_00.binproto
index 8535f0c56c..a3ce21959b 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_00.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_00.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 af8a3b0319..d79ac48e21 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_02.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_02.binproto
index 07a1c41641..7cf793cd73 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_02.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_02.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 ba35f00448..193ab376ce 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_04.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_04.binproto
index 4d1b956ff6..a4112c5424 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_04.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_04.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 ba4750d69e..7bf1e85793 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_06.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_06.binproto
index 8535f0c56c..a3ce21959b 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_06.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_06.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 af8a3b0319..d79ac48e21 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_08.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_08.binproto
index 07a1c41641..7cf793cd73 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_08.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_08.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 ba35f00448..193ab376ce 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_10.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_10.binproto
index 4d1b956ff6..a4112c5424 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_10.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_10.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 ba4750d69e..7bf1e85793 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_12.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_12.binproto
index 8535f0c56c..a3ce21959b 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_12.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_12.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 af8a3b0319..d79ac48e21 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_14.binproto b/app/src/androidTest/assets/backupTests/recipient_call_link_14.binproto
index 07a1c41641..7cf793cd73 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_call_link_14.binproto and b/app/src/androidTest/assets/backupTests/recipient_call_link_14.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 ba35f00448..193ab376ce 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_contacts_00.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_00.binproto
index ad8f2be5fa..a287605375 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_00.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_01.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_01.binproto
index dc10c5aafd..3f437d856e 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_01.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_02.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_02.binproto
index 61fb49fa02..944f67abf2 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_02.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_03.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_03.binproto
index 885ea77682..c3a4679be6 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_03.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_04.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_04.binproto
index 4e785e78cf..80ce70c566 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_04.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_05.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_05.binproto
index 66758d48b7..d95bf7dcd0 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_05.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_06.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_06.binproto
index 37922b43f3..d4d38f4afe 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_06.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_07.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_07.binproto
index 24456dec31..6a5d993cb9 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_07.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_08.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_08.binproto
index 1255c56cb8..ee8066c1bb 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_08.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_09.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_09.binproto
index e1e2fc80a1..b745061799 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_09.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_10.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_10.binproto
index b9e0598814..064d8f6ca9 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_10.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_11.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_11.binproto
index f5d0c99f0f..611daf08a3 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_contacts_11.binproto and b/app/src/androidTest/assets/backupTests/recipient_contacts_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_distribution_list_00.binproto b/app/src/androidTest/assets/backupTests/recipient_distribution_list_00.binproto
index 79d143bb9f..eb985fde00 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_distribution_list_00.binproto and b/app/src/androidTest/assets/backupTests/recipient_distribution_list_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_distribution_list_01.binproto b/app/src/androidTest/assets/backupTests/recipient_distribution_list_01.binproto
index 7163eea137..60127b0d9d 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_distribution_list_01.binproto and b/app/src/androidTest/assets/backupTests/recipient_distribution_list_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_distribution_list_02.binproto b/app/src/androidTest/assets/backupTests/recipient_distribution_list_02.binproto
index 5bbe095692..73db5efd99 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_distribution_list_02.binproto and b/app/src/androidTest/assets/backupTests/recipient_distribution_list_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_distribution_list_03.binproto b/app/src/androidTest/assets/backupTests/recipient_distribution_list_03.binproto
index 5c20ee8321..aa8ae7ea54 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_distribution_list_03.binproto and b/app/src/androidTest/assets/backupTests/recipient_distribution_list_03.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 a2ff0b448f..a067b93de9 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 a32050026e..c58077585d 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 c7789bd1b0..a632233219 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 461acae2c8..81c3a3d619 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 b099a4fc15..b48943e829 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 ed9039afae..30a5eacd20 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 4eaee60f52..98db637340 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 dc4744c2a9..e900b86890 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 fa1bcbfabb..1b4135fe1f 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 6b10dc6aa7..6156d92905 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 c2c97cb494..534496c757 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 4e70ec28b1..ebb7011dd0 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/androidTest/assets/backupTests/recipient_self_00.binproto b/app/src/androidTest/assets/backupTests/recipient_self_00.binproto
index 4457855fb7..7e00660f4b 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_00.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_01.binproto b/app/src/androidTest/assets/backupTests/recipient_self_01.binproto
index cbedf4ca6c..6df95fdf3c 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_01.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_02.binproto b/app/src/androidTest/assets/backupTests/recipient_self_02.binproto
index dad8f5689f..db317c6c92 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_02.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_03.binproto b/app/src/androidTest/assets/backupTests/recipient_self_03.binproto
index 08840c2e73..17219fa6ea 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_03.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_04.binproto b/app/src/androidTest/assets/backupTests/recipient_self_04.binproto
index 1f5e15b32b..c5ca390ebd 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_04.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_05.binproto b/app/src/androidTest/assets/backupTests/recipient_self_05.binproto
index 66b6bba0c8..f6bc3a8060 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_05.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_06.binproto b/app/src/androidTest/assets/backupTests/recipient_self_06.binproto
index 079ff95a6b..ed14f0289b 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_06.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_07.binproto b/app/src/androidTest/assets/backupTests/recipient_self_07.binproto
index 84efd04308..2594ce18ed 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_07.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_08.binproto b/app/src/androidTest/assets/backupTests/recipient_self_08.binproto
index 5a897fc2be..cdd5e2e542 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_08.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_09.binproto b/app/src/androidTest/assets/backupTests/recipient_self_09.binproto
index a618caad30..445f6d6e21 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_09.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_10.binproto b/app/src/androidTest/assets/backupTests/recipient_self_10.binproto
index 457fbe416c..24c23c1202 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_10.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_11.binproto b/app/src/androidTest/assets/backupTests/recipient_self_11.binproto
index a0950d42fc..f63d050171 100644
Binary files a/app/src/androidTest/assets/backupTests/recipient_self_11.binproto and b/app/src/androidTest/assets/backupTests/recipient_self_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/standard_frames.binproto b/app/src/androidTest/assets/backupTests/standard_frames.binproto
index f9dc434bf2..e5b2555329 100644
Binary files a/app/src/androidTest/assets/backupTests/standard_frames.binproto and b/app/src/androidTest/assets/backupTests/standard_frames.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/sticker_pack_00.binproto b/app/src/androidTest/assets/backupTests/sticker_pack_00.binproto
index fa066165e7..546e989cd9 100644
Binary files a/app/src/androidTest/assets/backupTests/sticker_pack_00.binproto and b/app/src/androidTest/assets/backupTests/sticker_pack_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/sticker_pack_01.binproto b/app/src/androidTest/assets/backupTests/sticker_pack_01.binproto
index fa066165e7..546e989cd9 100644
Binary files a/app/src/androidTest/assets/backupTests/sticker_pack_01.binproto and b/app/src/androidTest/assets/backupTests/sticker_pack_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/sticker_pack_02.binproto b/app/src/androidTest/assets/backupTests/sticker_pack_02.binproto
index fa066165e7..546e989cd9 100644
Binary files a/app/src/androidTest/assets/backupTests/sticker_pack_02.binproto and b/app/src/androidTest/assets/backupTests/sticker_pack_02.binproto differ
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataArchiveProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataArchiveProcessor.kt
index 9758c17664..29831ce894 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataArchiveProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataArchiveProcessor.kt
@@ -37,11 +37,13 @@ import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob
 import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues
 import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode
+import org.thoughtcrime.securesms.keyvalue.SettingsValues
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.ProfileUtil
 import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.thoughtcrime.securesms.webrtc.CallDataMode
 import org.whispersystems.signalservice.api.push.UsernameLinkComponents
 import org.whispersystems.signalservice.api.storage.IAPSubscriptionId.AppleIAPOriginalTransactionId
 import org.whispersystems.signalservice.api.storage.IAPSubscriptionId.GooglePlayBillingPurchaseToken
@@ -120,7 +122,6 @@ object AccountDataArchiveProcessor {
             customChatColors = db.chatColorsTable.getSavedChatColors().toRemoteChatColors().also { colors -> exportState.customChatColorIds.addAll(colors.map { it.id }) },
             optimizeOnDeviceStorage = signalStore.backupValues.optimizeStorage,
             backupTier = signalStore.backupValues.backupTier.toRemoteBackupTier(),
-            showSealedSenderIndicators = TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(context),
             defaultSentMediaQuality = signalStore.settingsValues.sentMediaQuality.toRemoteSentMediaQuality(),
             autoDownloadSettings = AccountData.AutoDownloadSettings(
               images = getRemoteAutoDownloadOption("image", mobileAutoDownload, wifiAutoDownload),
@@ -130,6 +131,8 @@ object AccountDataArchiveProcessor {
             ),
             screenLockTimeoutMinutes = screenLockTimeoutMinutes,
             pinReminders = signalStore.pinValues.arePinRemindersEnabled(),
+            appTheme = signalStore.settingsValues.theme.toRemoteAppTheme(),
+            callsUseLessDataSetting = signalStore.settingsValues.callDataMode.toRemoteCallsUseLessDataSetting(),
             defaultChatStyle = ChatStyleConverter.constructRemoteChatStyle(
               db = db,
               chatColors = chatColors,
@@ -141,7 +144,8 @@ object AccountDataArchiveProcessor {
           backupsSubscriberData = backupSubscriberRecord?.toIAPSubscriberData(),
           androidSpecificSettings = AccountData.AndroidSpecificSettings(
             useSystemEmoji = signalStore.settingsValues.isPreferSystemEmoji,
-            screenshotSecurity = TextSecurePreferences.isScreenSecurityEnabled(context)
+            screenshotSecurity = TextSecurePreferences.isScreenSecurityEnabled(context),
+            navigationBarSize = signalStore.settingsValues.useCompactNavigationBar.toRemoteNavigationBarSize()
           ),
           bioText = selfRecord.about ?: "",
           bioEmoji = selfRecord.aboutEmoji ?: ""
@@ -168,6 +172,7 @@ object AccountDataArchiveProcessor {
     if (accountData.androidSpecificSettings != null) {
       SignalStore.settings.isPreferSystemEmoji = accountData.androidSpecificSettings.useSystemEmoji
       TextSecurePreferences.setScreenSecurityEnabled(context, accountData.androidSpecificSettings.screenshotSecurity)
+      SignalStore.settings.setUseCompactNavigationBar(accountData.androidSpecificSettings.navigationBarSize.toLocalNavigationBarSize())
     }
 
     if (accountData.bioText.isNotBlank() || accountData.bioEmoji.isNotBlank()) {
@@ -255,6 +260,8 @@ object AccountDataArchiveProcessor {
     SignalStore.backup.optimizeStorage = settings.optimizeOnDeviceStorage
     SignalStore.backup.backupTier = settings.backupTier?.toLocalBackupTier()
     SignalStore.settings.sentMediaQuality = settings.defaultSentMediaQuality.toLocalSentMediaQuality()
+    SignalStore.settings.setTheme(settings.appTheme.toLocalTheme())
+    SignalStore.settings.setCallDataMode(settings.callsUseLessDataSetting.toLocalCallDataMode())
 
     if (settings.autoDownloadSettings != null) {
       val mobileDownloadSet = settings.autoDownloadSettings.toLocalAutoDownloadSet(AccountData.AutoDownloadSettings.AutoDownloadOption.WIFI_AND_CELLULAR)
@@ -475,4 +482,54 @@ object AccountDataArchiveProcessor {
     }
     return out
   }
+
+  private fun Boolean.toRemoteNavigationBarSize(): AccountData.AndroidSpecificSettings.NavigationBarSize {
+    return if (this) {
+      AccountData.AndroidSpecificSettings.NavigationBarSize.COMPACT
+    } else {
+      AccountData.AndroidSpecificSettings.NavigationBarSize.NORMAL
+    }
+  }
+
+  private fun AccountData.AndroidSpecificSettings.NavigationBarSize.toLocalNavigationBarSize(): Boolean {
+    return when (this) {
+      AccountData.AndroidSpecificSettings.NavigationBarSize.COMPACT -> true
+      AccountData.AndroidSpecificSettings.NavigationBarSize.NORMAL -> false
+      AccountData.AndroidSpecificSettings.NavigationBarSize.UNKNOWN_BAR_SIZE -> false
+    }
+  }
+
+  private fun SettingsValues.Theme.toRemoteAppTheme(): AccountData.AppTheme {
+    return when (this) {
+      SettingsValues.Theme.SYSTEM -> AccountData.AppTheme.SYSTEM
+      SettingsValues.Theme.LIGHT -> AccountData.AppTheme.LIGHT
+      SettingsValues.Theme.DARK -> AccountData.AppTheme.DARK
+    }
+  }
+
+  private fun AccountData.AppTheme.toLocalTheme(): SettingsValues.Theme {
+    return when (this) {
+      AccountData.AppTheme.SYSTEM -> SettingsValues.Theme.SYSTEM
+      AccountData.AppTheme.LIGHT -> SettingsValues.Theme.LIGHT
+      AccountData.AppTheme.DARK -> SettingsValues.Theme.DARK
+      AccountData.AppTheme.UNKNOWN_APP_THEME -> SettingsValues.Theme.SYSTEM
+    }
+  }
+
+  private fun CallDataMode.toRemoteCallsUseLessDataSetting(): AccountData.CallsUseLessDataSetting {
+    return when (this) {
+      CallDataMode.LOW_ALWAYS -> AccountData.CallsUseLessDataSetting.WIFI_AND_MOBILE_DATA
+      CallDataMode.HIGH_ON_WIFI -> AccountData.CallsUseLessDataSetting.MOBILE_DATA_ONLY
+      CallDataMode.HIGH_ALWAYS -> AccountData.CallsUseLessDataSetting.NEVER
+    }
+  }
+
+  private fun AccountData.CallsUseLessDataSetting.toLocalCallDataMode(): CallDataMode {
+    return when (this) {
+      AccountData.CallsUseLessDataSetting.WIFI_AND_MOBILE_DATA -> CallDataMode.LOW_ALWAYS
+      AccountData.CallsUseLessDataSetting.MOBILE_DATA_ONLY -> CallDataMode.HIGH_ON_WIFI
+      AccountData.CallsUseLessDataSetting.NEVER -> CallDataMode.HIGH_ALWAYS
+      AccountData.CallsUseLessDataSetting.UNKNOWN_CALL_DATA_SETTING -> CallDataMode.HIGH_ALWAYS
+    }
+  }
 }
diff --git a/app/src/main/protowire/Backup.proto b/app/src/main/protowire/Backup.proto
index abed5ee87e..77ba043bad 100644
--- a/app/src/main/protowire/Backup.proto
+++ b/app/src/main/protowire/Backup.proto
@@ -88,6 +88,20 @@ message AccountData {
     AutoDownloadOption documents = 4;
   }
 
+  enum AppTheme {
+    UNKNOWN_APP_THEME = 0; // Interpret as "System"
+    SYSTEM = 1;
+    LIGHT = 2;
+    DARK = 3;
+  }
+
+  enum CallsUseLessDataSetting {
+    UNKNOWN_CALL_DATA_SETTING = 0; // Interpret as "Never"
+    NEVER = 1;
+    MOBILE_DATA_ONLY = 2;
+    WIFI_AND_MOBILE_DATA = 3;
+  }
+
   message AccountSettings {
     bool readReceipts = 1;
     bool sealedSenderIndicators = 2;
@@ -111,12 +125,14 @@ message AccountData {
     bool optimizeOnDeviceStorage = 20;
     // See zkgroup for integer particular values. Unset if backups are not enabled.
     optional uint64 backupTier = 21;
-    bool showSealedSenderIndicators = 22;
+    reserved /* showSealedSenderIndicators */ 22;
     SentMediaQuality defaultSentMediaQuality = 23;
     AutoDownloadSettings autoDownloadSettings = 24;
     reserved /* wifiAutoDownloadSettings */ 25;
     optional uint32 screenLockTimeoutMinutes = 26; // If unset, consider screen lock to be disabled.
     optional bool pinReminders = 27; // If unset, consider pin reminders to be enabled.
+    AppTheme appTheme = 28;  // If unset, treat the same as "Unknown" case
+    CallsUseLessDataSetting callsUseLessDataSetting = 29;  // If unset, treat the same as "Unknown" case
   }
 
   message SubscriberData {
@@ -138,8 +154,15 @@ message AccountData {
   }
 
   message AndroidSpecificSettings {
+    enum NavigationBarSize {
+      UNKNOWN_BAR_SIZE = 0; // Intepret as "Normal"
+      NORMAL = 1;
+      COMPACT = 2;
+    }
+
     bool useSystemEmoji = 1;
     bool screenshotSecurity = 2;
+    NavigationBarSize navigationBarSize = 3; // If unset, treat the same as "Unknown" case
   }
 
   bytes profileKey = 1;
@@ -1387,4 +1410,4 @@ message ChatFolder {
   repeated uint64 includedRecipientIds = 7; // generated recipient id of groups, contacts, and/or note to self
   repeated uint64 excludedRecipientIds = 8; // generated recipient id of groups, contacts, and/or note to self
   bytes id = 9; // should be 16 bytes
-}
\ No newline at end of file
+}