diff --git a/app/src/androidTest/assets/backupTests/account_data_00.binproto b/app/src/androidTest/assets/backupTests/account_data_00.binproto
index bf4210d340..0c68243ee1 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 c35b0efd08..d19f890cac 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 9e1ae760de..d042705647 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 ea1a8cf637..34bd2764d1 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 8034235838..233f7c2c9d 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 137f515d70..0528e2225e 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 a66ed85cfe..ac37e1db58 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 0f3b67bd91..b254bbe114 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 f0a2957dd4..0ac227c510 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 34f0edf02c..b970c08663 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 540135ce96..9d6053d780 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 d7a5715d3e..d37c1f5737 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 b8aa62d0a5..091b0b98d3 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 8c3fc91d8f..93b6537862 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 d7fb074599..eee2e7183c 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 da8c77548b..9d98db7c2b 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 3fa9092c38..8fa5a17e03 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 db230fc8b0..f1aaf270ee 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 6da7d672c1..1a1c0d7ed3 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 13ab22f66e..26daafb125 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 f13087a105..38322ba144 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 7f97ff38d3..78e4768f38 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 11b1cec9df..f5dcce2c0a 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 7d3f46930b..00fb097546 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 7e057ef2f4..7f12f59e91 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 f7cb99d37e..5dbde30f69 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 e0b5046a0f..6481cc7ed8 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 697bac48dc..a6bed81faf 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 24df3dd14c..b310eeaed1 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 c0e3cb1a4e..87914f302e 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 58edf44e59..9041c12edd 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/chat_00.binproto b/app/src/androidTest/assets/backupTests/chat_00.binproto
index 22d0b1883a..667223fcc3 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 30d5ecd5d5..1a14b1b8a1 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 77a50c9174..8af285988f 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 5603578dde..8dab00d5df 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 94bc7e0a59..46b69eb9c3 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 0f3fad4140..4e2aed653b 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 3f7c38e453..b2080358e7 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 52ce6aaf8c..9d21feabb0 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 5c1fef57c1..56506b5c07 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 4a42454750..688a64ffe6 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 d45cc40062..f07cdd2d39 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 9c1d7c17ec..41920144e0 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 e0db666f38..be0eb5377e 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 d117f6cbe2..aa54329d90 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 eb225292b1..dc1791cf16 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 d43b1328ee..bc9b6c2110 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 24ed360a61..863bdf4a7a 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 47251045a7..c78d042e54 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 c8ba5fcee4..2fec5b82ba 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 303ffca025..9306615b95 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 710f6e2da2..119e329eba 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 11bea33c94..356e200bda 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 7845536e8c..a76834ff0b 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 10c805efe2..7f38d41466 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 709788e3b5..cc2d406f9c 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 97ec18ab7a..bbe5abeef0 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 f227a70bbc..fc10205d92 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 ea38ece59f..3747c278ef 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 0f3d042821..970b497734 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 182e0960c2..03ff02f39a 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 831d0ba8a5..85d862716d 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 db58c48873..c3ba3adebf 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 3c2a413b9e..50b4a830da 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 2ae505c826..c2de6f1e62 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 32b454f408..9963d7abcb 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 a23b6abe5e..8ba0b5bdc6 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 214eb9afc0..a38a30a721 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 4336f0f307..0efbadcb4a 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 141c84dcd2..fe5af65d30 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 cdb721fafb..46fc048088 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 1e0a901013..9087530ca3 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 62143c2955..3285774594 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 4c14eadfd9..039207fb62 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 d6d679031d..26215a3dfc 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 ff9f42b98e..325fb41052 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 9b243c28b5..41cdcff59d 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 176fa49afd..449b0fb3c6 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 7a92826e0b..f5b778b54e 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 8aa5a0b134..b66a6d9a37 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 9f7bbfb038..395397d186 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 b709396491..b510fdd1c2 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 41043be7a5..17fc48a011 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 59a2ff7284..98fbe021c4 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 1258734352..124131ca25 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 2728512e1d..0ce10b630e 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 75ab6ef8f8..09cc5a05c6 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 f5410960a7..70bfb3d154 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 507049cf4a..7d15dd1abf 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 67dc03577a..9f835d1948 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 af4c85d2f6..7c4671e730 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 ce82204454..0847531453 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 754aa762db..57e0fd1c15 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 c17667b967..ec62dfe4df 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 6605018c81..73c0dac9ca 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 b6b8180256..b6d2d2eb99 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 7901c82121..916f2e47f1 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 6947eef5b5..c77c37c1e9 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 2ec2a65ba3..a9588985e7 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 8d773f257a..ef899f2fed 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 1f0341feb0..0eb36561c5 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 3f49b0a246..852860d96c 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 45d13ef66c..53138284b7 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_direct_story_reply_with_edits_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_11.binproto
index e8e29ac2d7..db7e0b3799 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_12.binproto
index 34d95160a5..dc7659378c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_13.binproto
index 189445621f..dbfb1720f0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_13.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 bc6a4b1815..b5f88175c8 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 78ce669e17..2b4938d60f 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 67c4e40af9..6a9face717 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 40df3a5a88..a9d17df69e 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 1b263cbc51..db06c660ea 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 2d8b57706e..c7fbf5c13f 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 b1fa63d5fd..49a564ac47 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 2ac9193210..2e133c8480 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 95c0c2ee28..2731dd0f22 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 2d04373d06..0572e04d19 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 e62a280629..e6941ca8a1 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 93e049db11..3674421636 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 b1ae5ecb5a..29791dd17c 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 75496f9599..e568e17a77 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 0972006cc8..af0d405b57 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 d0cd369e34..15d7e21b7a 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 ce8bc8283c..d25a3e47c7 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 9b97ff17c3..02ca4063b4 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 95c4e498b5..79a035042f 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 69507d4c5c..f9762388c2 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 24ab98788e..bec7dad427 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 c40d450a0b..f3313e30d0 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 d1c6a11398..b67e9b7c79 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 205c5b4819..c8bbd22582 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 89911c08c3..98a0310ae8 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 0f7ae44fca..dc8f359dcb 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 5120729d61..31a0c3853a 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 c61e956b11..089a33777a 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 9444b233ba..8d16efbb74 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 0e93fea840..44c3411537 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 0a2f9344b4..14ec8a67f4 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 6f146e3558..e9ae913ec1 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 2c9a75c418..b07d7cf808 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 9e6b108c1b..0513ebc606 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 ed4f6c387c..7254e28a56 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_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_group_change_chat_update_00.binproto
index eadb1d17a5..0d03c30ec0 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 b835e94025..1063d34c8d 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 b922c5c16d..fd1d2ff3c6 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 36c4dc8d91..e6bb96519b 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 cf856e84be..5f52295fa7 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 38d667307e..63d3f6318a 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 f190e75ebf..4397657868 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 751bdb5216..73e19bf549 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 7a08a9b01d..f8d3411746 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 76056b2c16..4425908fa9 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 38405650d7..da4e7e36ec 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 4710b24f09..41e3868ce3 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 7d16e727f6..7954c537bf 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 34581974f0..b5d238b0f3 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 7c5d8c9e1d..bc9b40bf7e 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 7e8343caa9..14938f8512 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 542f97d8c1..4e88e890af 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 fe3903ea4f..8a84f4253e 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 ca17411229..ef3167a4f7 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 4a4c1447ce..aa139a289d 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 6ecfdb26ca..3c2ad649c8 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 fae67e8863..3895df58b8 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 ba560e2257..c4edfa4eb8 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 ee382a4649..056bb57da3 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 468423daf6..23169fe556 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 afb7abbe98..2353c6cf5c 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 c6c2d7187a..2dc6e3d996 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 aee299ee07..622c5b076e 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 bc9d6741c7..33dea2e965 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 bf6384c152..a509a05665 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 a55f55a0d0..2183a5e3d6 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 cf10ad83a4..c27b07ee96 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 445845cf3b..37999f2e2b 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 bba7dc8ba2..ee5759183f 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_individual_call_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_00.binproto
index 1b83efefd9..300bf404b3 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 4712318f97..122836f40e 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 f87fc7d2af..1cac1bc2f1 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 018bd0ef13..b44cf5c03a 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 6b40952ed8..be2dee597e 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 9f35ca8e67..d4952702a8 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 9e8d39a22a..f1c8fb8527 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 f04b5d1b01..cad81d4e9c 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 418ccc9625..f2bffc6ec5 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 b0c739510a..d31734cc5c 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 bc30b70254..88e4052921 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 ac54a9dea5..e0008a3fb3 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 785f15c644..310e55cf3d 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 5f278d1e7e..64b4635901 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 ffa5cddf13..56ba297e91 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 f3c3cdf452..6c8f586fad 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 6a567992fa..3951e2e40b 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 1e6a44b018..02ebef2de5 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 338148f16f..2302fa7ab5 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 6db7d113bd..8bdd5ef461 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 9a692b2d2e..3663d2a4f5 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 e6ccc6ab90..1639144949 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 cc1bba57fc..1924dc523b 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 070e2b8bca..436433d0a4 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_profile_change_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_profile_change_update_00.binproto
index 0a34eade94..e5139d11fa 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 806ee9e658..223c45855c 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 cef3862429..ae7e920f90 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 c734c22de9..ccf0933371 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 b88eae9436..442453e55f 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 2cebc4b261..ccf5d935ee 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 b29f86e1e2..ed8d2743ff 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 3b24462f06..d1ab375595 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 031fd6f897..917a992c00 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 f46574c6c9..d91cd80e1b 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 9bafdb9970..51faac4747 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 5807eda8c8..079b440674 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 97325a46b2..1b84609d4f 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 b0313786e0..57d13ce59a 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 40c3cfb028..c4667ff351 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 0e242ca443..d498235d7b 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 6e8c8f0985..d4621a2484 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 5f598389c3..c59c450568 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 8d5b8c3d1a..7ed2e7b63e 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 6bde8064ca..e238e1e597 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 af70fb6c4a..78cc84149a 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 33304a7650..9766b2f6a7 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 ccb9c8724f..b51141c8af 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 a5c9d862d0..a46c26f014 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 9b3ebcca15..fc682c6610 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 cb5e00887f..164b23225d 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 4a8ba81c1a..7b014f1d60 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 46248579fe..60e64fb717 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 f08878cfc5..bd6ff64ee3 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 96d4fe6a5c..0593c06598 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 c20351a0c4..b18d05b05e 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 f95b03f8c2..bf930e8a74 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 030e6d5311..e69889f70f 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 7ba8c92029..1d70b0f140 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 128ad8a45a..a9c11d8a90 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 7e53c1fc0e..8ae23f3970 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 9ebe0ec6d5..ffe052779e 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 8a731b9809..1e81ef6832 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 b6a0eb399e..f063a9db34 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 7771c3e80f..1d9c25d81d 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 b871624dcf..e858b7d7a6 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 dca4f16159..868ceb312a 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 ac3855bc4c..fa25914abd 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 539fbbb8c0..f336814dc7 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 a3f1850558..6461a067b5 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 d189e33dc0..7cb90f5ec5 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 6ae6addf2a..f70bb3ffdc 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 5563c697ef..824c126f7c 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 331421f7e5..3c327aa3e8 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 70b0e89ccc..53fb0dd6c8 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 d7b07030ee..7bf920e8c8 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_long_text_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_long_text_00.binproto
index 58245bd0c7..dfb7214143 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 dd7b8c8077..9f250056a1 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 7f9ddd8246..b732d06d83 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 cdb83376cb..b922c3669e 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 effd543df3..fa7455c47f 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 15b7bc3d5d..0a337f35a9 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 1910ce98a5..f5e10a3d24 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 9a105e63b0..494473b599 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 40d38c625f..ff6282e6d8 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 9506d9f6d8..2b641ee8ff 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 e07e06ad96..3d7f8c7f1e 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 809457887a..6dd9dd7179 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 92b4182c9c..e1b32ca177 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 35187319a2..d0ded2f960 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 c3e97fef9b..e0a37c8aae 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 b2a9a0c51c..bdb56ae7d1 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 dc377d740c..b1a6e54ece 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 b864964bb0..70090d3678 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 e732e1acf1..55c380de2e 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 eb871f0ddd..a4e7da5cfc 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 7b47c1d2ee..c8c79fa786 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 9cd0a11e26..d498d4728f 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 0d3e05cf40..fbadb40f85 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 148a9a6a64..252e0daebe 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 8c3a7e4fd8..4cdb958225 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 faf3d943ef..99573e0ffd 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 8ef7569267..f28515adfe 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 06d2ed2489..ad53a185c0 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 d0ccd7c1aa..967e11b289 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 c0d6b622f9..a8839a55cc 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 8dcfaaa7b0..7fa0b801e7 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 1bef174991..bdd75b2773 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 eb788b98e9..062e6a5bbe 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 e1f4e4dc12..0c7a5e8218 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 07f15ee11f..2d75c320c0 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 8c6bd37654..038e13d06b 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 e12c411095..57ebe1ec72 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 a009cadd3e..c6119933cd 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 9809e32f47..46472cf69f 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 6557679a4b..f1d2cec198 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 dd6cc5da26..475a56f7eb 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 eeed868061..474bf6df3f 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 c7f8bdcde7..a3e1e942e9 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 fbb2dd1497..57b3f8b64c 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 b8081b4609..0c343b4ee8 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 58de364098..e67d04f0a3 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 9b5f0a2563..0288b4861e 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 dd2dc478fa..a3799f1613 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 dd5670121e..899e0c42df 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 7f05349340..7c3c1dba84 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 2ca39b07a1..a6c6e3a2f8 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 d4eee4f17b..298026448c 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 8824466a3b..6ce1b3b0d0 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 cf0a3adc18..8fae2018d2 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 72de168da1..c571778800 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 762499f788..113829dbdd 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 6d5c458a92..47197de1cf 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 eaef4f750f..a0ffa68637 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 bae5002d3c..ebb647ff94 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 2928474ab4..da11a26e55 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_text_only_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_text_only_00.binproto
index c20dd78714..d34c5dcc58 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 a68531f455..cc803cdb61 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 2430198fb9..5a5d19cacd 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 fe6d7639d7..d153613ac9 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 d3956d569a..1198c39d86 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 1e85e0f1d2..cb543ed123 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 c1dd7c31d4..12bc152a20 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 22362d12e3..183379c426 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 e36e3a1bed..9d86996e00 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 d00bdb164f..39be5a4d58 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 deab543f1f..a09fa28f37 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 c907a6e50a..519a5f85ad 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 724fb26063..81c7b158a9 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 8dad31a13c..a66aa23282 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 7fbb548aa1..7c9c5f9120 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 6894aeab5c..829314faf1 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 e48afdbfd8..f2601b768d 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 0e2b3b8e53..3dfc638594 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 3eb1194207..b6554998a7 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 5891f9ab1c..320ccb4e7e 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 3d9f682c3a..25a93c872b 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 c95e1666f5..26cd4290d9 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 efbf24412d..a3cc68a8f4 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 9e62fecec9..9a58d1433c 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 3f5f30f87a..0d370f7460 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 ff117dec5a..15c78faf45 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 c9b062284b..e39e31df2a 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 64b580971e..056f953304 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 bd1e92988c..293e4971d7 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 c2a4189738..0e88825fd5 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 73c52a8eb9..dc7b90a190 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 e147e981b6..db6eb84910 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 f210e1ecdc..bfade12edc 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 684bbc7eab..307a257fc0 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 cd385818bc..9d034a8d20 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 8a53345dc5..5224ca32e6 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 de8c2c0614..6680a56f1e 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 f79646f12d..ac4ae4486f 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 71f1682c94..fcd9d276c7 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 8dd6f38717..38104b1b14 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 22432ca779..9798aae9c4 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 bd2bf6c24a..7b95ff2c74 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 449b417580..6d592b2238 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 13dc200968..e3a64bcf49 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 535ed091dc..930217836d 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 bd28a56501..03f8ecc00d 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 0ed95dab81..c3225ea23f 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 396e345e56..d9d8d7bac7 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_standard_message_with_quote_15.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_15.binproto
index f5285d8889..878a6469b0 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_15.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_15.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_16.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_16.binproto
index 7061e979b8..e377bb2e9f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_16.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_16.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 366c52d9d5..77d455c41b 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 11f3aebcf7..45e1b3585a 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 8c2e2f8462..7898b0ba98 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 84916ea202..539db5adb4 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 a71d56fff2..9a5713704a 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 5c235f0c37..c911cbd62b 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 d8b39e6aa3..a31dde9beb 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 f2fda589aa..41bb72122a 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 84a2ce9fac..0a9db69c71 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 f56e467286..7b2c8a74c8 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 7b5fc00320..cdeed07baf 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 c6e83a0bf5..986843d326 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 94effcd21e..4e45c98625 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 4dfa6d74cc..7773f351bf 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 bccc294d31..8c9942a57e 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 749a5a89fc..67e43077fb 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 c65fc9fcef..aa34f6cb9b 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 f81372a3aa..e2d6569756 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 786047518e..89623a60d1 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 f12d470204..9b35a6a8a9 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 211b43338e..401a5419be 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 d4090f55a1..27d70ccabb 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 ed1a57a12d..6fcc09d111 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 94c39512be..870a0880a2 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 de46636bad..6aa74d0acb 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 0277fb5107..9690d85e5b 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 0be6f70b14..5d81ba1367 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 ee187d5589..fdc60bef3c 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 7c78ca9897..ba893754ed 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 7fda40ad2a..aa6c883f1e 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/chat_item_view_once_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_13.binproto
index b465103ae1..3236d3b12b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_view_once_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_view_once_14.binproto
index d10f15c7cf..7ffb7f603e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_view_once_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_view_once_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/notification_profile_00.binproto b/app/src/androidTest/assets/backupTests/notification_profile_00.binproto
index 0d824c20da..0509b3220a 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 1dc35617f9..8b86f53682 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 433fb40eb8..26a5aa9ef0 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 9b8069b5e2..9c6f4e3ac7 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 9cf671515b..6fdadbcd63 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 058b5f39b1..9052299c45 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 c380fc0c73..954f60944b 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 d8edd273fc..33b5feb1de 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 d01ad6956f..c0dcb5d7f2 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 acb4f93517..cd608e7c1d 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 0234e4c43d..caa09453eb 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 7de2c39948..be77d1542b 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 26eaa0af3a..1399b7e3a6 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 6727177926..a330f43d2e 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 223637cf61..611d797872 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 56f8ec669b..cd128bac0c 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 455b7de41e..49ed4cc1d8 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 863a453ccc..73cbf04c3f 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 26eaa0af3a..1399b7e3a6 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 6727177926..a330f43d2e 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 223637cf61..611d797872 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 56f8ec669b..cd128bac0c 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 455b7de41e..49ed4cc1d8 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 863a453ccc..73cbf04c3f 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 26eaa0af3a..1399b7e3a6 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 6727177926..a330f43d2e 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 223637cf61..611d797872 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 56f8ec669b..cd128bac0c 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 342f392f52..e9777df174 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 a9296aa3cc..17cf40d9e7 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 7c7acc84d6..46703a8737 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 a4cec77662..66b05efb60 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 724a68cf22..b2ccd6ea2f 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 2bbbc298d9..05c0529d42 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
new file mode 100644
index 0000000000..022763952d
Binary files /dev/null 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
new file mode 100644
index 0000000000..d894d5a860
Binary files /dev/null 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
new file mode 100644
index 0000000000..8adf672dda
Binary files /dev/null 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
new file mode 100644
index 0000000000..9d3588eb35
Binary files /dev/null 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
new file mode 100644
index 0000000000..bc8a1a6eb4
Binary files /dev/null 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
new file mode 100644
index 0000000000..fa5eec5959
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/recipient_contacts_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_contacts_12.binproto b/app/src/androidTest/assets/backupTests/recipient_contacts_12.binproto
new file mode 100644
index 0000000000..54f2c65af2
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/recipient_contacts_12.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 7dac9c1c97..37419ba59b 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 a9308ff285..ff22da0db2 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 e03d2fa50a..d64e13841e 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 253adff2da..70ab5137fd 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 4974d69d2a..844a7e626d 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 670d007551..cc0c9030b7 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 6d617e0a0c..f839f12d29 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 efeac8cb0b..e1fd194540 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
new file mode 100644
index 0000000000..4156429ee0
Binary files /dev/null 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
new file mode 100644
index 0000000000..120ba8eb8a
Binary files /dev/null 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
new file mode 100644
index 0000000000..7dca91f341
Binary files /dev/null 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
new file mode 100644
index 0000000000..8d306bb572
Binary files /dev/null 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
new file mode 100644
index 0000000000..42c251ab3f
Binary files /dev/null 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
new file mode 100644
index 0000000000..3899989605
Binary files /dev/null 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
new file mode 100644
index 0000000000..376bf82dcb
Binary files /dev/null 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
new file mode 100644
index 0000000000..7ec4fc9738
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/recipient_groups_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_groups_12.binproto b/app/src/androidTest/assets/backupTests/recipient_groups_12.binproto
new file mode 100644
index 0000000000..dadf23f2ce
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/recipient_groups_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_00.binproto b/app/src/androidTest/assets/backupTests/recipient_self_00.binproto
new file mode 100644
index 0000000000..9acba46b21
Binary files /dev/null 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
new file mode 100644
index 0000000000..14447ba8f7
Binary files /dev/null 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
new file mode 100644
index 0000000000..88f1c4a6ef
Binary files /dev/null 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
new file mode 100644
index 0000000000..fe6532260a
Binary files /dev/null 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
new file mode 100644
index 0000000000..85198e0ddd
Binary files /dev/null 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
new file mode 100644
index 0000000000..31dcac4df9
Binary files /dev/null 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
new file mode 100644
index 0000000000..ca9bc68896
Binary files /dev/null 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
new file mode 100644
index 0000000000..e14040e34e
Binary files /dev/null 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
new file mode 100644
index 0000000000..cb902cb54f
Binary files /dev/null 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
new file mode 100644
index 0000000000..78205da7af
Binary files /dev/null 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
new file mode 100644
index 0000000000..a96572954c
Binary files /dev/null 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
new file mode 100644
index 0000000000..f6a2e184fb
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/recipient_self_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/recipient_self_12.binproto b/app/src/androidTest/assets/backupTests/recipient_self_12.binproto
new file mode 100644
index 0000000000..3afa1f6d97
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/recipient_self_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/standard_frames.binproto b/app/src/androidTest/assets/backupTests/standard_frames.binproto
index ad93aabf09..c9da738646 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 a6f3f1ac71..b0f51b0b4b 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 a6f3f1ac71..b0f51b0b4b 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 a6f3f1ac71..b0f51b0b4b 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/androidTest/java/org/thoughtcrime/securesms/backup/v2/ArchiveImportExportTests.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/ArchiveImportExportTests.kt
index 0887335bc7..36f60454d5 100644
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/ArchiveImportExportTests.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/ArchiveImportExportTests.kt
@@ -231,6 +231,11 @@ class ArchiveImportExportTests {
     runTests { it.startsWith("recipient_groups_") }
   }
 
+  //  @Test
+  fun recipientSelf() {
+    runTests { it.startsWith("recipient_self_") }
+  }
+
   private fun runTests(predicate: (String) -> Boolean = { true }) {
     val testFiles = InstrumentationRegistry.getInstrumentation().context.resources.assets.list(TESTS_FOLDER)!!.filter(predicate)
     val results: MutableList<TestResult> = mutableListOf()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/RecipientTableArchiveExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/RecipientTableArchiveExtensions.kt
index d76d7eed78..10a6206802 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/RecipientTableArchiveExtensions.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/RecipientTableArchiveExtensions.kt
@@ -55,6 +55,7 @@ fun RecipientTable.getContactsForBackup(selfId: Long): ContactArchiveExporter {
       "${RecipientTable.TABLE_NAME}.${RecipientTable.MUTE_UNTIL}",
       "${RecipientTable.TABLE_NAME}.${RecipientTable.CHAT_COLORS}",
       "${RecipientTable.TABLE_NAME}.${RecipientTable.CUSTOM_CHAT_COLORS_ID}",
+      "${RecipientTable.TABLE_NAME}.${RecipientTable.AVATAR_COLOR}",
       "${RecipientTable.TABLE_NAME}.${RecipientTable.EXTRAS}",
       "${IdentityTable.TABLE_NAME}.${IdentityTable.IDENTITY_KEY}",
       "${IdentityTable.TABLE_NAME}.${IdentityTable.VERIFIED}"
@@ -91,6 +92,7 @@ fun RecipientTable.getGroupsForBackup(selfAci: ServiceId.ACI): GroupArchiveExpor
       "${RecipientTable.TABLE_NAME}.${RecipientTable.PROFILE_SHARING}",
       "${RecipientTable.TABLE_NAME}.${RecipientTable.MUTE_UNTIL}",
       "${RecipientTable.TABLE_NAME}.${RecipientTable.EXTRAS}",
+      "${RecipientTable.TABLE_NAME}.${RecipientTable.AVATAR_COLOR}",
       "${GroupTable.TABLE_NAME}.${GroupTable.V2_MASTER_KEY}",
       "${GroupTable.TABLE_NAME}.${GroupTable.SHOW_AS_STORY_STATE}",
       "${GroupTable.TABLE_NAME}.${GroupTable.TITLE}",
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ContactArchiveExporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ContactArchiveExporter.kt
index 1adebe3c34..4c90fc677f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ContactArchiveExporter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ContactArchiveExporter.kt
@@ -18,6 +18,8 @@ import org.thoughtcrime.securesms.backup.v2.ArchiveRecipient
 import org.thoughtcrime.securesms.backup.v2.proto.Contact
 import org.thoughtcrime.securesms.backup.v2.proto.Self
 import org.thoughtcrime.securesms.backup.v2.util.clampToValidBackupRange
+import org.thoughtcrime.securesms.backup.v2.util.toRemote
+import org.thoughtcrime.securesms.conversation.colors.AvatarColor
 import org.thoughtcrime.securesms.database.IdentityTable
 import org.thoughtcrime.securesms.database.RecipientTable
 import org.thoughtcrime.securesms.database.RecipientTableCursorUtil
@@ -49,7 +51,9 @@ class ContactArchiveExporter(private val cursor: Cursor, private val selfId: Lon
     if (id == selfId) {
       return ArchiveRecipient(
         id = id,
-        self = Self()
+        self = Self(
+          avatarColor = cursor.requireString(RecipientTable.AVATAR_COLOR)?.let { AvatarColor.deserialize(it) }?.toRemote()
+        )
       )
     }
 
@@ -81,6 +85,7 @@ class ContactArchiveExporter(private val cursor: Cursor, private val selfId: Lon
       .systemGivenName(cursor.requireString(RecipientTable.SYSTEM_GIVEN_NAME) ?: "")
       .systemFamilyName(cursor.requireString(RecipientTable.SYSTEM_FAMILY_NAME) ?: "")
       .systemNickname(cursor.requireString(RecipientTable.SYSTEM_NICKNAME) ?: "")
+      .avatarColor(cursor.requireString(RecipientTable.AVATAR_COLOR)?.let { AvatarColor.deserialize(it) }?.toRemote())
 
     val registeredState = RecipientTable.RegisteredState.fromId(cursor.requireInt(RecipientTable.REGISTERED))
     if (registeredState == RecipientTable.RegisteredState.REGISTERED) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/GroupArchiveExporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/GroupArchiveExporter.kt
index 8b4719eba9..d7afab0c2e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/GroupArchiveExporter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/GroupArchiveExporter.kt
@@ -12,6 +12,7 @@ import org.signal.core.util.requireBoolean
 import org.signal.core.util.requireInt
 import org.signal.core.util.requireLong
 import org.signal.core.util.requireNonNullBlob
+import org.signal.core.util.requireString
 import org.signal.storageservice.protos.groups.AccessControl
 import org.signal.storageservice.protos.groups.Member
 import org.signal.storageservice.protos.groups.local.DecryptedBannedMember
@@ -23,6 +24,8 @@ import org.signal.storageservice.protos.groups.local.EnabledState
 import org.thoughtcrime.securesms.backup.v2.ArchiveGroup
 import org.thoughtcrime.securesms.backup.v2.ArchiveRecipient
 import org.thoughtcrime.securesms.backup.v2.proto.Group
+import org.thoughtcrime.securesms.backup.v2.util.toRemote
+import org.thoughtcrime.securesms.conversation.colors.AvatarColor
 import org.thoughtcrime.securesms.database.GroupTable
 import org.thoughtcrime.securesms.database.RecipientTable
 import org.thoughtcrime.securesms.database.RecipientTableCursorUtil
@@ -59,7 +62,8 @@ class GroupArchiveExporter(private val selfAci: ServiceId.ACI, private val curso
         blocked = cursor.requireBoolean(RecipientTable.BLOCKED),
         hideStory = extras?.hideStory() ?: false,
         storySendMode = showAsStoryState.toRemote(),
-        snapshot = decryptedGroup.toRemote(isActive, selfAci)
+        snapshot = decryptedGroup.toRemote(isActive, selfAci),
+        avatarColor = cursor.requireString(RecipientTable.AVATAR_COLOR)?.let { AvatarColor.deserialize(it) }?.toRemote()
       )
     )
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ContactArchiveImporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ContactArchiveImporter.kt
index d939c471ae..9f651a47d8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ContactArchiveImporter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ContactArchiveImporter.kt
@@ -11,6 +11,7 @@ import org.signal.core.util.insertInto
 import org.signal.core.util.toInt
 import org.signal.core.util.update
 import org.thoughtcrime.securesms.backup.v2.proto.Contact
+import org.thoughtcrime.securesms.backup.v2.util.toLocal
 import org.thoughtcrime.securesms.database.IdentityTable
 import org.thoughtcrime.securesms.database.RecipientTable
 import org.thoughtcrime.securesms.database.SQLiteDatabase
@@ -54,7 +55,8 @@ object ContactArchiveImporter {
       RecipientTable.NICKNAME_FAMILY_NAME to contact.nickname?.family,
       RecipientTable.SYSTEM_GIVEN_NAME to contact.systemGivenName,
       RecipientTable.SYSTEM_FAMILY_NAME to contact.systemFamilyName,
-      RecipientTable.SYSTEM_NICKNAME to contact.systemNickname
+      RecipientTable.SYSTEM_NICKNAME to contact.systemNickname,
+      RecipientTable.AVATAR_COLOR to contact.avatarColor?.toLocal()?.serialize()
     )
 
     if (contact.registered != null) {
@@ -111,6 +113,6 @@ private fun Contact.toLocalExtras(): RecipientExtras {
 private val Contact.formattedE164: String?
   get() {
     return e164?.let {
-      SignalE164Util.formatAsE164(e164.toString())
+      SignalE164Util.formatAsE164("+$e164")
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/GroupArchiveImporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/GroupArchiveImporter.kt
index e6d4421adf..74b3fdf6bb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/GroupArchiveImporter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/GroupArchiveImporter.kt
@@ -21,6 +21,7 @@ import org.signal.storageservice.protos.groups.local.DecryptedTimer
 import org.signal.storageservice.protos.groups.local.EnabledState
 import org.thoughtcrime.securesms.backup.v2.ArchiveGroup
 import org.thoughtcrime.securesms.backup.v2.proto.Group
+import org.thoughtcrime.securesms.backup.v2.util.toLocal
 import org.thoughtcrime.securesms.conversation.colors.AvatarColorHash
 import org.thoughtcrime.securesms.database.GroupTable
 import org.thoughtcrime.securesms.database.RecipientTable
@@ -56,6 +57,7 @@ object GroupArchiveImporter {
       put(RecipientTable.BLOCKED, group.blocked.toInt())
       put(RecipientTable.TYPE, RecipientTable.RecipientType.GV2.id)
       put(RecipientTable.STORAGE_SERVICE_ID, Base64.encodeWithPadding(StorageSyncHelper.generateKey()))
+      put(RecipientTable.AVATAR_COLOR, group.avatarColor?.toLocal()?.serialize())
       if (group.hideStory) {
         val extras = RecipientExtras.Builder().hideStory(true).build()
         put(RecipientTable.EXTRAS, extras.encode())
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 6aaee63ec4..699ad1ff96 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
@@ -68,6 +68,7 @@ object AccountDataArchiveProcessor {
           givenName = selfRecord.signalProfileName.givenName,
           familyName = selfRecord.signalProfileName.familyName,
           avatarUrlPath = selfRecord.signalProfileAvatar ?: "",
+          svrPin = SignalStore.svr.pin ?: "",
           username = selfRecord.username?.takeIf { it.isNotBlank() },
           usernameLink = if (selfRecord.username.isNotNullOrBlank() && signalStore.accountValues.usernameLink != null) {
             AccountData.UsernameLink(
@@ -114,6 +115,9 @@ object AccountDataArchiveProcessor {
     SignalDatabase.recipients.restoreSelfFromBackup(accountData, selfId)
 
     SignalStore.account.setRegistered(true)
+    if (accountData.svrPin.isNotBlank()) {
+      SignalStore.svr.setPin(accountData.svrPin)
+    }
 
     val context = AppDependencies.application
     val settings = accountData.accountSettings
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/RecipientArchiveProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/RecipientArchiveProcessor.kt
index e0932c15fb..3f21408e68 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/RecipientArchiveProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/RecipientArchiveProcessor.kt
@@ -6,6 +6,7 @@
 package org.thoughtcrime.securesms.backup.v2.processor
 
 import org.signal.core.util.logging.Log
+import org.signal.core.util.update
 import org.thoughtcrime.securesms.backup.v2.ArchiveRecipient
 import org.thoughtcrime.securesms.backup.v2.ExportState
 import org.thoughtcrime.securesms.backup.v2.ImportState
@@ -21,6 +22,8 @@ import org.thoughtcrime.securesms.backup.v2.importer.GroupArchiveImporter
 import org.thoughtcrime.securesms.backup.v2.proto.Frame
 import org.thoughtcrime.securesms.backup.v2.proto.ReleaseNotes
 import org.thoughtcrime.securesms.backup.v2.stream.BackupFrameEmitter
+import org.thoughtcrime.securesms.backup.v2.util.toLocal
+import org.thoughtcrime.securesms.database.RecipientTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -99,9 +102,16 @@ object RecipientArchiveProcessor {
       recipient.contact != null -> ContactArchiveImporter.import(recipient.contact)
       recipient.group != null -> GroupArchiveImporter.import(recipient.group)
       recipient.distributionList != null -> DistributionListArchiveImporter.import(recipient.distributionList, importState)
-      recipient.self != null -> Recipient.self().id
       recipient.releaseNotes != null -> SignalDatabase.recipients.restoreReleaseNotes()
       recipient.callLink != null -> CallLinkArchiveImporter.import(recipient.callLink)
+      recipient.self != null -> {
+        SignalDatabase.writableDatabase
+          .update(RecipientTable.TABLE_NAME)
+          .values(RecipientTable.AVATAR_COLOR to recipient.self.avatarColor?.toLocal()?.serialize())
+          .where("${RecipientTable.ID} = ?", Recipient.self().id)
+          .run()
+        Recipient.self().id
+      }
       else -> {
         Log.w(TAG, "Unrecognized recipient type!")
         null
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/util/ArchiveConverterExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/util/ArchiveConverterExtensions.kt
index 276a3eff2b..ac5cdb12b1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/util/ArchiveConverterExtensions.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/util/ArchiveConverterExtensions.kt
@@ -18,6 +18,7 @@ import org.thoughtcrime.securesms.attachments.TombstoneAttachment
 import org.thoughtcrime.securesms.backup.v2.BackupRepository.getMediaName
 import org.thoughtcrime.securesms.backup.v2.ImportState
 import org.thoughtcrime.securesms.backup.v2.proto.FilePointer
+import org.thoughtcrime.securesms.conversation.colors.AvatarColor
 import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.stickers.StickerLocator
 import org.whispersystems.signalservice.api.backup.MediaName
@@ -25,6 +26,7 @@ import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPoin
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId
 import org.whispersystems.signalservice.api.util.UuidUtil
 import java.util.Optional
+import org.thoughtcrime.securesms.backup.v2.proto.AvatarColor as RemoteAvatarColor
 
 /**
  * Converts a [FilePointer] to a local [Attachment] object for inserting into the database.
@@ -176,3 +178,39 @@ fun DatabaseAttachment.toRemoteFilePointer(mediaArchiveEnabled: Boolean, content
 fun Long.clampToValidBackupRange(): Long {
   return this.coerceIn(0, 8640000000000000)
 }
+
+fun AvatarColor.toRemote(): RemoteAvatarColor {
+  return when (this) {
+    AvatarColor.A100 -> RemoteAvatarColor.A100
+    AvatarColor.A110 -> RemoteAvatarColor.A110
+    AvatarColor.A120 -> RemoteAvatarColor.A120
+    AvatarColor.A130 -> RemoteAvatarColor.A130
+    AvatarColor.A140 -> RemoteAvatarColor.A140
+    AvatarColor.A150 -> RemoteAvatarColor.A150
+    AvatarColor.A160 -> RemoteAvatarColor.A160
+    AvatarColor.A170 -> RemoteAvatarColor.A170
+    AvatarColor.A180 -> RemoteAvatarColor.A180
+    AvatarColor.A190 -> RemoteAvatarColor.A190
+    AvatarColor.A200 -> RemoteAvatarColor.A200
+    AvatarColor.A210 -> RemoteAvatarColor.A210
+    AvatarColor.UNKNOWN -> RemoteAvatarColor.A100
+    AvatarColor.ON_SURFACE_VARIANT -> RemoteAvatarColor.A100
+  }
+}
+
+fun RemoteAvatarColor.toLocal(): AvatarColor {
+  return when (this) {
+    RemoteAvatarColor.A100 -> AvatarColor.A100
+    RemoteAvatarColor.A110 -> AvatarColor.A110
+    RemoteAvatarColor.A120 -> AvatarColor.A120
+    RemoteAvatarColor.A130 -> AvatarColor.A130
+    RemoteAvatarColor.A140 -> AvatarColor.A140
+    RemoteAvatarColor.A150 -> AvatarColor.A150
+    RemoteAvatarColor.A160 -> AvatarColor.A160
+    RemoteAvatarColor.A170 -> AvatarColor.A170
+    RemoteAvatarColor.A180 -> AvatarColor.A180
+    RemoteAvatarColor.A190 -> AvatarColor.A190
+    RemoteAvatarColor.A200 -> AvatarColor.A200
+    RemoteAvatarColor.A210 -> AvatarColor.A210
+  }
+}
diff --git a/app/src/main/protowire/Backup.proto b/app/src/main/protowire/Backup.proto
index d069b70aa1..e40652f96f 100644
--- a/app/src/main/protowire/Backup.proto
+++ b/app/src/main/protowire/Backup.proto
@@ -117,6 +117,7 @@ message AccountData {
   reserved /*backupsSubscriberData*/ 8; // A deprecated format
   AccountSettings accountSettings = 9;
   IAPSubscriberData backupsSubscriberData = 10;
+  string svrPin = 11;
 }
 
 message Recipient {
@@ -132,6 +133,30 @@ message Recipient {
   }
 }
 
+// If unset - computed as the value of the first byte of SHA-256(msg=CONTACT_ID)
+// modulo the count of colors. Once set the avatar color for a recipient is
+// never recomputed or changed.
+//
+// `CONTACT_ID` is the first available identifier from the list:
+// - ServiceIdToBinary(ACI)
+// - E164
+// - ServiceIdToBinary(PNI)
+// - Group Id
+enum AvatarColor {
+  A100 = 0;
+  A110 = 1;
+  A120 = 2;
+  A130 = 3;
+  A140 = 4;
+  A150 = 5;
+  A160 = 6;
+  A170 = 7;
+  A180 = 8;
+  A190 = 9;
+  A200 = 10;
+  A210 = 11;
+}
+
 message Contact {
   enum IdentityState {
     DEFAULT = 0; // A valid value -- indicates unset by the user
@@ -180,6 +205,7 @@ message Contact {
   string systemGivenName = 18;
   string systemFamilyName = 19;
   string systemNickname = 20;
+  optional AvatarColor avatarColor = 21;
 }
 
 message Group {
@@ -195,6 +221,7 @@ message Group {
   StorySendMode storySendMode = 4;
   GroupSnapshot snapshot = 5;
   bool blocked = 6;
+  optional AvatarColor avatarColor = 7;
 
   // These are simply plaintext copies of the groups proto from Groups.proto.
   // They should be kept completely in-sync with Groups.proto.
@@ -274,7 +301,9 @@ message Group {
   }
 }
 
-message Self {}
+message Self {
+  optional AvatarColor avatarColor = 1;
+}
 
 message ReleaseNotes {}
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 302c885a0c..0e303407cc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ androidx-window = "1.3.0"
 glide = "4.15.1"
 gradle = "8.7.3"
 kotlin = "2.1.0"
-libsignal-client = "0.67.1"
+libsignal-client = "0.67.2"
 mp4parser = "1.9.39"
 android-gradle-plugin = "8.7.2"
 accompanist = "0.28.0"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 9f44a3ef87..dc1cac3622 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -6604,20 +6604,20 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="6eb4422e8a618b3b76cb2096a3619d251f9e27989dc68307a1e5414c3710f2d1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.signal" name="libsignal-android" version="0.67.1">
-         <artifact name="libsignal-android-0.67.1.aar">
-            <sha256 value="b8cf0a43c70f0ecd3ef3189705b90feb0a17e61f4e51aacd11d296f9d8b5ddb2" origin="Generated by Gradle"/>
+      <component group="org.signal" name="libsignal-android" version="0.67.2">
+         <artifact name="libsignal-android-0.67.2.aar">
+            <sha256 value="fc3396beb8b5f86ab834e0c3c34542a9a72ed862c8e135d621af9b29b237de04" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="libsignal-android-0.67.1.module">
-            <sha256 value="c6314734a5537a0400cc027aac20e4e3c0c4a9eb29b401ce1199f1169d2853bd" origin="Generated by Gradle"/>
+         <artifact name="libsignal-android-0.67.2.module">
+            <sha256 value="cc96980f2bf61701800f9e5d17b0dea587978588e1f3f69ee963f53866e4fc87" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.signal" name="libsignal-client" version="0.67.1">
-         <artifact name="libsignal-client-0.67.1.jar">
-            <sha256 value="e98e882ebef8b216bae58a5e02e6bf9442e1e82b989f32274a82e4f0b0e7c353" origin="Generated by Gradle"/>
+      <component group="org.signal" name="libsignal-client" version="0.67.2">
+         <artifact name="libsignal-client-0.67.2.jar">
+            <sha256 value="ced650ef3d6316ca37d27074d5c1373570cb421b71140f3a7a268c22f72a2ca7" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="libsignal-client-0.67.1.module">
-            <sha256 value="fde0e0e2eede5976ce75b6d5721ccccc1f7b2833b649e68c3e973451c87e2c90" origin="Generated by Gradle"/>
+         <artifact name="libsignal-client-0.67.2.module">
+            <sha256 value="bdbe1c5d8b262b486e9d95f37023cf5236443e90cde8e9d9608c3cd18e07c86f" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.signal" name="ringrtc-android" version="2.50.0">