diff --git a/app/src/androidTest/assets/backupTests/account_data_00.binproto b/app/src/androidTest/assets/backupTests/account_data_00.binproto
index 33cd94511a..bf4210d340 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 aadf22e6ee..d377221e41 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 7ce1f9f720..cde12d0e3a 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 d01e722529..ea1a8cf637 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 4f8dc7f277..518cada9f1 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 21e50c3463..a1049c24ca 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 60f5d31afc..a66ed85cfe 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 186209c434..8bf39cbd61 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 ec81dbbd31..5b8f37e5b6 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 69750de2e4..34f0edf02c 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 e4e577adc5..e76a9f5858 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 f47ecc535a..7bafd52ee2 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 7a09f4565e..b8aa62d0a5 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 b0b29708bc..4e7a218b5a 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 0b70eb255e..cd6ec52737 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 4bc931e3ef..da8c77548b 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 eccec0a433..f6fc4f80a6 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 8a68ee11b1..d90f3ba91c 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 7b601b5002..6da7d672c1 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 3620688b40..a25173823d 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 f67d92ece1..01ada5d0b2 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 2cae6d1b6c..7f97ff38d3 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 6aca5dba84..ccf975a2cc 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 62880519b7..b2968801fd 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 82e89cca0b..7e057ef2f4 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 a72712ec64..34d548fbc3 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 c7d29f3fb0..d92dedf38d 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 2b7be31377..697bac48dc 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 ef6427e566..24df3dd14c 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 cd678780b5..c0e3cb1a4e 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 2633261e75..58edf44e59 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 3333623fb9..22d0b1883a 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 91db1eaf81..30d5ecd5d5 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 50d071621b..77a50c9174 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 ef963f5b67..5603578dde 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 6b54ae21dd..94bc7e0a59 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 2e65ab153b..0f3fad4140 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 eda2f427cf..3f7c38e453 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 b1cf4aba48..52ce6aaf8c 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 bced1ced77..5c1fef57c1 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 ff4dafe2c5..4a42454750 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 d36b0265cc..d45cc40062 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 64cd9f2005..9c1d7c17ec 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 1b0da8307e..e0db666f38 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 ae49a511b2..d117f6cbe2 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 9f2c775a65..eb225292b1 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 f39638ede1..d43b1328ee 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 a2252fbfb9..24ed360a61 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 2612e19a4c..47251045a7 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 c9dec51c52..c8ba5fcee4 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 b0a630ae97..303ffca025 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 737d5053a8..710f6e2da2 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 7c030dcda3..11bea33c94 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 9e0b2919bb..7845536e8c 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 d0797013a3..10c805efe2 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 c41863fe4f..709788e3b5 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 a533ca441f..97ec18ab7a 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 2e5715090b..f227a70bbc 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 8542eb0bc6..cbf3893840 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 c9d3e2dff7..5cd860fee0 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 9b45d2852a..b1b6ec960b 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 6a7eb4dac3..e811602ffa 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 c0011f497c..db58c48873 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 1475a4a6a1..3c2a413b9e 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 3df6778b3c..2ae505c826 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 601cc4aa25..32b454f408 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 9333b464c7..a23b6abe5e 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 9daeeb8a3e..214eb9afc0 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 4723d8f88c..4336f0f307 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 821b22caed..141c84dcd2 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 26a7f388e8..cdb721fafb 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 9ae16e9ed7..1e0a901013 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 d02f99d23f..62143c2955 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 f2c486a450..4c14eadfd9 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 0abb13687e..d6d679031d 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 4eea60e590..ff9f42b98e 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 430f9ec061..9b243c28b5 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_expiration_timer_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_expiration_timer_update_00.binproto
index 7f4ed81c00..bc6a4b1815 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 b7898c1ffb..78ce669e17 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 30366d8d1c..67c4e40af9 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 48092f975d..40df3a5a88 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 2f46617504..1b263cbc51 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 7d9eab59ee..2d8b57706e 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 b221afb4ec..b1fa63d5fd 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 ecc9412b46..2ac9193210 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 a10e2a96d9..95c0c2ee28 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 9014984cfb..2d04373d06 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 24e8d589f7..e62a280629 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 3495ab52d7..93e049db11 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 6bdd809fc3..b1ae5ecb5a 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 beb4ea5ffd..75496f9599 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 0f1d5a8e7f..0972006cc8 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 f417ab535d..d0cd369e34 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 e738dfe4ae..ce8bc8283c 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 acdf0847aa..9b97ff17c3 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 0c25c20bff..95c4e498b5 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 d95558ad9e..69507d4c5c 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 d7fc927406..24ab98788e 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 4ab92d7d2f..c40d450a0b 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 3b6184db43..d1c6a11398 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 48cb36a0e7..205c5b4819 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 412700cccc..89911c08c3 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 7460dae0e2..0f7ae44fca 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 346fc6c284..5120729d61 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 bedc16d0b6..c61e956b11 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 f1625ec495..9444b233ba 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 2c0c4766cd..0e93fea840 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 b5fba7cb89..0a2f9344b4 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 4211210f00..6f146e3558 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 b833c99e5e..2c9a75c418 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 d32662b484..9e6b108c1b 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 47d2dd0ef0..ed4f6c387c 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 6dad124118..eadb1d17a5 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 cc08d139ac..b835e94025 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 b32b465b4d..b922c5c16d 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 2d97ee042b..36c4dc8d91 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 a3ac89cc84..cf856e84be 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 a5701c5841..38d667307e 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 441b48188f..f190e75ebf 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 f328d247cc..751bdb5216 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 4c120a7189..7a08a9b01d 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 3f85afb4c1..76056b2c16 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 ea8680dcbc..38405650d7 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 b7b03db2fd..4710b24f09 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 bd8e875e7a..7d16e727f6 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 c1262a27fa..34581974f0 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 5cf1dbc271..7c5d8c9e1d 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 a9b8a39c0e..7e8343caa9 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 4145d63760..542f97d8c1 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 1a23337096..fe3903ea4f 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 07942f3b5a..ca17411229 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 9cdf2e86d7..4a4c1447ce 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 1ac7dd0143..6ecfdb26ca 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 f8d7585dc6..fae67e8863 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 64bb7885be..ba560e2257 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 265c3c1676..ee382a4649 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 0adaaa6c8e..468423daf6 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 e08f302db1..afb7abbe98 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 6dbc5639c7..c6c2d7187a 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 e18c714be6..aee299ee07 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 2e9952afb3..bc9d6741c7 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 61fcb8e752..bf6384c152 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 2fb193be3f..a55f55a0d0 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 5b7b01bc2d..cf10ad83a4 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 77ba470e87..445845cf3b 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 525588c42a..bba7dc8ba2 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 77f461d993..1b83efefd9 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 e829a586aa..4712318f97 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 e49d9ce5b1..f87fc7d2af 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 69b4faef11..018bd0ef13 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 affe330ba3..6b40952ed8 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 be5521c7a4..9f35ca8e67 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 0e97f77e38..9e8d39a22a 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 7922671adb..f04b5d1b01 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 7ed8b8afc5..418ccc9625 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 09fe7cc429..b0c739510a 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 4473d22fdc..bc30b70254 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 10bfde1ee4..ac54a9dea5 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 6c9744d7e7..785f15c644 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 479c82cc5e..5f278d1e7e 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 b2a310d3a3..ffa5cddf13 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 874d5610f7..f3c3cdf452 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 9265e90e91..6a567992fa 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 3908bc8768..1e6a44b018 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 8a3785a47c..338148f16f 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 c87c0a08a9..6db7d113bd 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 d876ee6d40..9a692b2d2e 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 300a310713..e6ccc6ab90 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 16e78a4280..cc1bba57fc 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 0dce02ab17..070e2b8bca 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 6098f33992..0a34eade94 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 762373b4f5..806ee9e658 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 0382248e50..cef3862429 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 a7f8ea8217..c734c22de9 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 c917b48e91..b88eae9436 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 33ea7946f4..2cebc4b261 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 b43db4a968..b29f86e1e2 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 5e9daa9c76..3b24462f06 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 183eec91a3..031fd6f897 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 7e2d68eed1..f46574c6c9 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 874359b59d..9bafdb9970 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 76b05e252e..5807eda8c8 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 646cf50245..97325a46b2 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 ef5a7cfc5d..b0313786e0 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 309807da26..40c3cfb028 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 fc83fe8f15..0e242ca443 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 6f590c74c6..6e8c8f0985 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 66796fd423..5f598389c3 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 bfb521b96d..8d5b8c3d1a 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 fe059b3934..6bde8064ca 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 2c482e2451..af70fb6c4a 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 f9447f26ba..33304a7650 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 1fcefbb773..ccb9c8724f 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 fcb5bdc8b5..a5c9d862d0 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 7ec90064a2..9b3ebcca15 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 a42072992a..cb5e00887f 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 f32ac27ef0..4a8ba81c1a 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 392612462d..46248579fe 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 c6c6f0e538..f08878cfc5 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 17e1d37e21..96d4fe6a5c 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 8e1707dd7b..c20351a0c4 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 36ec62618a..f95b03f8c2 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 63d97ba707..030e6d5311 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 3d42e4cb0a..7ba8c92029 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 0baf021afc..128ad8a45a 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 a8d34570ad..7e53c1fc0e 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 49c69153ab..106b18d28b 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 baaa9d6d8f..8f1a86703c 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 bdb8554ab7..b513dfa9d6 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 401f665f1a..3a75a45dd3 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 97470d76d8..461ac3b3d4 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 09b33e0580..e6323a109b 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 bf052b538e..5ba13ac33a 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 c00f9d564b..01bb28f39d 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 39b4cc6ed6..7cc5fdfc1b 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 c5f489f916..01e1495d87 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 92bc1570ef..3588dedde0 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 014efd830e..78cc9dfb8a 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 ed45fcdf55..1f236803a1 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 5a9845bc00..01394f4bec 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 1a614fe9ec..22e1c65edc 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 0eae171bc0..58245bd0c7 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 38eb28264e..dd7b8c8077 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 62f49ae832..7f9ddd8246 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 94a6a6bc72..cdb83376cb 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 0a0fa4f615..effd543df3 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 dd2baff89d..15b7bc3d5d 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 903b64ac7f..1910ce98a5 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 5a073bfe5f..9a105e63b0 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 da4659e0dd..40d38c625f 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 171e503410..9506d9f6d8 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 86a053ace6..e07e06ad96 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 a5430b592b..809457887a 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 8b21d5b6ce..92b4182c9c 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 60b00b94f1..35187319a2 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 ed16fbc7e6..c3e97fef9b 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 ac7b71ac75..b2a9a0c51c 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 f9679560fe..dc377d740c 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 6f52108e6a..b864964bb0 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 3699c22e12..e732e1acf1 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 9fe749da04..eb871f0ddd 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 969d45dfd3..7b47c1d2ee 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 1412aa063e..9cd0a11e26 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 5aebbc13ba..0d3e05cf40 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 55a4bc0f50..148a9a6a64 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 b0d251c6fd..8c3a7e4fd8 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 c91f62427d..faf3d943ef 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 2027c9b99b..8ef7569267 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 c57e015dfe..06d2ed2489 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 5832b33f0d..d0ccd7c1aa 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 9ddb002ee5..c0d6b622f9 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 44137e1e3f..8dcfaaa7b0 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 6ef5b12f38..1bef174991 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 a6d5189fef..eb788b98e9 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 74335018b2..e1f4e4dc12 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 e518f5fb7f..07f15ee11f 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 d5ff79febd..8c6bd37654 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 f218f561bd..e12c411095 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 cc464f04d1..a009cadd3e 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 5a6ed591ae..9809e32f47 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 93a59715a6..6557679a4b 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 c4e3a11ecb..dd6cc5da26 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 b4caeed366..eeed868061 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 f6f8111de3..c7f8bdcde7 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 c8b6e8abea..fbb2dd1497 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 ac00c6953b..b8081b4609 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 bd169feda7..58de364098 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 1d60d5cd77..9b5f0a2563 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 cfaf780636..dd2dc478fa 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 3a123251aa..dd5670121e 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 ffa5f9d535..7f05349340 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 fed8ff9433..2ca39b07a1 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 67e8cb3544..d4eee4f17b 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 13768b33ca..8824466a3b 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 22f4410a62..cf0a3adc18 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 d346d2712c..72de168da1 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 3e3cd4edc3..762499f788 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 3eb2a1f2f5..6d5c458a92 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 71072c6cc3..eaef4f750f 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 b1435c7099..bae5002d3c 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 3334c445a3..2928474ab4 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 24f78ea96a..c20dd78714 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 e4d77d1d72..a68531f455 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 10aef47141..2430198fb9 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 3b94a63ada..fe6d7639d7 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 6ab350b6c7..d3956d569a 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 48a0e9deb5..1e85e0f1d2 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 10685cc43d..c1dd7c31d4 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 62b8842f83..22362d12e3 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 e5679b57f6..e36e3a1bed 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 01dd4b0450..d00bdb164f 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 e044f703a8..deab543f1f 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 959ca920fe..c907a6e50a 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 4c3002c844..724fb26063 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 83479b593a..8dad31a13c 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 0f814ebb1f..7fbb548aa1 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 9ae142e085..6894aeab5c 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 71de0df433..e48afdbfd8 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 043668637c..0e2b3b8e53 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 541fbedaf9..63f8a80207 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 6b713ee8e9..bec6c20578 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 946e1af611..0907cfca78 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 7b9d2b844d..aa6edcd0fa 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 17a912329b..35e7dcdfda 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 fbdeecc51a..c82676d040 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 efae0852f7..b1e20b5f96 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 fa4f72734d..25cc76c4c8 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 b2545c0e47..e88b7d2f60 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 27360e484b..66806f2c58 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 d282ac7756..38801c695e 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 da8255fe16..22abeb9a34 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 8497af972c..66dafbbeaf 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 40b08be8c7..e5290a2876 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 a57063abbd..1668122cbb 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 c7f2e71bc0..15414b3e21 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 fd7937a491..35c3487402 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 bfe56d3d79..c593c22905 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 951fb99bfb..56a3771a87 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 49325ea8e4..6fcaf713b4 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 931adcfeec..8cdad8dad1 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 e68d6d936c..4b8fa54d51 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 77a0d2527f..a6cc7cbe0a 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 b43a891141..ef30bad93b 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 423ad482ef..c29f4b5952 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 836cfabeb0..3d2bd0ab68 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 858a8d8686..1c56228d1d 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 7534d4dcd4..69741d25d7 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 27f36cc18f..8f9bb7f948 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 414a35f7b4..1a4638c778 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_sticker_message_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_sticker_message_00.binproto
index e11cda1566..366c52d9d5 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 1081212b77..11f3aebcf7 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 643a2f603d..8c2e2f8462 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 66c4d0734c..84916ea202 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 bf2daa0359..a71d56fff2 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 80d9f3289a..5c235f0c37 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 0d59bf1c39..d8b39e6aa3 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 7c88e4c990..f2fda589aa 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 65048ab283..84a2ce9fac 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 761e3cb316..f56e467286 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 8f1298dead..7b5fc00320 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 9baba88c2c..c6e83a0bf5 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 ed62f8f261..94effcd21e 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 b8bc87ee3a..4dfa6d74cc 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 91ea6f1d0f..bccc294d31 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 6342078dc1..749a5a89fc 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 8a7dbc776d..c65fc9fcef 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 bdb13e36ac..f81372a3aa 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 7411df0e9a..786047518e 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 6ddd4a9044..f12d470204 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 0cc7b8fc44..211b43338e 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 8e91f10bd9..d4090f55a1 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 ef8c1111e2..ed1a57a12d 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 b0fc494479..94c39512be 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 7a7657805f..de46636bad 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 beeb9ff538..0277fb5107 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 826ad6b7da..0be6f70b14 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 c02a26a81a..ee187d5589 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 c9a3bf51cf..7c78ca9897 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 c6a5d3456c..7fda40ad2a 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 e677417fc5..b465103ae1 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 2c8af978d1..d10f15c7cf 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 ff34e2c8b3..0d824c20da 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 c9d13ecbd5..1dc35617f9 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 d431c74666..433fb40eb8 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 483acd2a3f..9b8069b5e2 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 36e205d288..9cf671515b 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 0dacc8abbe..058b5f39b1 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 1f29253765..c380fc0c73 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 3a6c1bb54a..d8edd273fc 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 7cd1433e0c..d01ad6956f 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 b16ca179e8..acb4f93517 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 748e4c1374..0234e4c43d 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 2904964ba3..7de2c39948 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 e939040d5e..26eaa0af3a 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 b1a37c1106..6727177926 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 2dbd2cb256..223637cf61 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 2fcbfce7d4..56f8ec669b 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 b6a73a6214..455b7de41e 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 b599b39a29..863a453ccc 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 e939040d5e..26eaa0af3a 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 b1a37c1106..6727177926 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 2dbd2cb256..223637cf61 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 2fcbfce7d4..56f8ec669b 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 b6a73a6214..455b7de41e 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 b599b39a29..863a453ccc 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 e939040d5e..26eaa0af3a 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 b1a37c1106..6727177926 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 2dbd2cb256..223637cf61 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 2fcbfce7d4..56f8ec669b 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 ece61620e8..d2c7a24431 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 28265026d6..fa38e5c5d6 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 3a72f8c222..a091cd7033 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 3173985945..34ee2c32e1 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_distribution_list_00.binproto b/app/src/androidTest/assets/backupTests/recipient_distribution_list_00.binproto
index 395a706c71..7dac9c1c97 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 79b3e13cb6..a9308ff285 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 0656bb5529..e03d2fa50a 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 520f164f80..253adff2da 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 91e20e643b..7b8eaf72b4 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 b1fe6fa419..7e9c00e1d0 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 bd3b40635d..fefcdcd704 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 3d70c9d1d9..79d027e740 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/standard_frames.binproto b/app/src/androidTest/assets/backupTests/standard_frames.binproto
index 38bca6df36..ad93aabf09 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 1122d07e64..a6f3f1ac71 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 1122d07e64..a6f3f1ac71 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 1122d07e64..a6f3f1ac71 100644
Binary files a/app/src/androidTest/assets/backupTests/sticker_pack_02.binproto and b/app/src/androidTest/assets/backupTests/sticker_pack_02.binproto differ
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt
index 0827268427..801cd2f48e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt
@@ -522,7 +522,8 @@ object BackupRepository {
           BackupInfo(
             version = VERSION,
             backupTimeMs = exportState.backupTime,
-            mediaRootBackupKey = SignalStore.backup.mediaRootBackupKey.value.toByteString()
+            mediaRootBackupKey = SignalStore.backup.mediaRootBackupKey.value.toByteString(),
+            firstAppVersion = SignalStore.backup.firstAppVersion
           )
         )
         frameCount++
@@ -899,6 +900,8 @@ object BackupRepository {
     AppDependencies.jobManager.addAll(groupJobs)
     stopwatch.split("group-jobs")
 
+    SignalStore.backup.firstAppVersion = header.firstAppVersion
+
     Log.d(TAG, "[import] Finished! ${eventTimer.stop().summary}")
     stopwatch.stop(TAG)
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatArchiveExporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatArchiveExporter.kt
index 83814917d1..76e48d8dbd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatArchiveExporter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatArchiveExporter.kt
@@ -55,7 +55,7 @@ class ChatArchiveExporter(private val cursor: Cursor, private val db: SignalData
       id = cursor.requireLong(ThreadTable.ID),
       recipientId = cursor.requireLong(ThreadTable.RECIPIENT_ID),
       archived = cursor.requireBoolean(ThreadTable.ARCHIVED),
-      pinnedOrder = cursor.requireInt(ThreadTable.PINNED),
+      pinnedOrder = cursor.requireInt(ThreadTable.PINNED).takeIf { it > 0 },
       expirationTimerMs = cursor.requireLong(RecipientTable.MESSAGE_EXPIRATION_TIME).seconds.inWholeMilliseconds.takeIf { it > 0 },
       expireTimerVersion = cursor.requireInt(RecipientTable.MESSAGE_EXPIRATION_TIME_VERSION),
       muteUntilMs = cursor.requireLong(RecipientTable.MUTE_UNTIL).takeIf { it > 0 }?.clampToValidBackupRange(),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
index 2081359d9d..9c04ca322b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
@@ -605,7 +605,7 @@ private fun CallTable.Call.toRemoteCallUpdate(db: SignalDatabase, messageRecord:
           ringerRecipientId = this.ringerRecipient?.toLong(),
           startedCallRecipientId = ACI.parseOrNull(groupCallUpdateDetails.startedCallUuid)?.let { db.recipientTable.getByAci(it).getOrNull()?.toLong() },
           startedCallTimestamp = this.timestamp.clampToValidBackupRange(),
-          endedCallTimestamp = groupCallUpdateDetails.endedCallTimestamp.clampToValidBackupRange(),
+          endedCallTimestamp = groupCallUpdateDetails.endedCallTimestamp.clampToValidBackupRange().takeIf { it > 0 },
           read = messageRecord.read
         )
       )
@@ -766,32 +766,32 @@ private fun BackupMessageRecord.toRemoteContactMessage(mediaArchiveEnabled: Bool
     ContactAttachment(
       name = it.name.toRemote(),
       avatar = (it.avatar?.attachment as? DatabaseAttachment)?.toRemoteMessageAttachment(mediaArchiveEnabled)?.pointer,
-      organization = it.organization,
+      organization = it.organization ?: "",
       number = it.phoneNumbers.map { phone ->
         ContactAttachment.Phone(
           value_ = phone.number,
           type = phone.type.toRemote(),
-          label = phone.label
+          label = phone.label ?: ""
         )
       },
       email = it.emails.map { email ->
         ContactAttachment.Email(
           value_ = email.email,
-          label = email.label,
+          label = email.label ?: "",
           type = email.type.toRemote()
         )
       },
       address = it.postalAddresses.map { address ->
         ContactAttachment.PostalAddress(
           type = address.type.toRemote(),
-          label = address.label,
-          street = address.street,
-          pobox = address.poBox,
-          neighborhood = address.neighborhood,
-          city = address.city,
-          region = address.region,
-          postcode = address.postalCode,
-          country = address.country
+          label = address.label ?: "",
+          street = address.street ?: "",
+          pobox = address.poBox ?: "",
+          neighborhood = address.neighborhood ?: "",
+          city = address.city ?: "",
+          region = address.region ?: "",
+          postcode = address.postalCode ?: "",
+          country = address.country ?: ""
         )
       }
     )
@@ -802,14 +802,24 @@ private fun BackupMessageRecord.toRemoteContactMessage(mediaArchiveEnabled: Bool
   )
 }
 
-private fun Contact.Name.toRemote(): ContactAttachment.Name {
+private fun Contact.Name.toRemote(): ContactAttachment.Name? {
+  if (givenName.isNullOrEmpty() &&
+    familyName.isNullOrEmpty() &&
+    prefix.isNullOrEmpty() &&
+    suffix.isNullOrEmpty() &&
+    middleName.isNullOrEmpty() &&
+    nickname.isNullOrEmpty()
+  ) {
+    return null
+  }
+
   return ContactAttachment.Name(
-    givenName = givenName,
-    familyName = familyName,
-    prefix = prefix,
-    suffix = suffix,
-    middleName = middleName,
-    nickname = nickname
+    givenName = givenName ?: "",
+    familyName = familyName ?: "",
+    prefix = prefix ?: "",
+    suffix = suffix ?: "",
+    middleName = middleName ?: "",
+    nickname = nickname ?: ""
   )
 }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contactshare/Contact.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/Contact.java
index 97cfffb225..cb0adac915 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contactshare/Contact.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/contactshare/Contact.java
@@ -356,7 +356,7 @@ public class Contact implements Parcelable {
       return type;
     }
 
-    public @NonNull String getLabel() {
+    public @Nullable String getLabel() {
       return label;
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupCallUpdateDetailsUtil.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupCallUpdateDetailsUtil.java
index 09d1e7342b..cb1c6014ac 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupCallUpdateDetailsUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupCallUpdateDetailsUtil.java
@@ -34,7 +34,7 @@ public final class GroupCallUpdateDetailsUtil {
     GroupCallUpdateDetails details = new GroupCallUpdateDetails.Builder()
         .startedCallUuid(Objects.toString(startedCallAci, ""))
         .startedCallTimestamp(groupCallChatUpdate.startedCallTimestamp)
-        .endedCallTimestamp(groupCallChatUpdate.endedCallTimestamp)
+        .endedCallTimestamp(groupCallChatUpdate.endedCallTimestamp != null ? groupCallChatUpdate.endedCallTimestamp : 0)
         .isCallFull(false)
         .isRingingOnLocalDevice(false)
         .build();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt
index f07cea117c..89c1a49e6b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt
@@ -39,6 +39,7 @@ class BackupValues(store: KeyValueStore) : SignalStoreValues(store) {
     private const val KEY_LATEST_BACKUP_TIER = "backup.latestBackupTier"
     private const val KEY_LAST_CHECK_IN_MILLIS = "backup.lastCheckInMilliseconds"
     private const val KEY_LAST_CHECK_IN_SNOOZE_MILLIS = "backup.lastCheckInSnoozeMilliseconds"
+    private const val KEY_FIRST_APP_VERSION = "backup.firstAppVersion"
 
     private const val KEY_NEXT_BACKUP_TIME = "backup.nextBackupTime"
     private const val KEY_LAST_BACKUP_TIME = "backup.lastBackupTime"
@@ -120,6 +121,11 @@ class BackupValues(store: KeyValueStore) : SignalStoreValues(store) {
    */
   var lastCheckInSnoozeMillis: Long by longValue(KEY_LAST_CHECK_IN_SNOOZE_MILLIS, 0)
 
+  /**
+   * The first app version to make a backup. Persisted across backup/restores to help indicate backup age.
+   */
+  var firstAppVersion: String by stringValue(KEY_FIRST_APP_VERSION, "")
+
   /**
    * Key used to backup messages.
    */
diff --git a/app/src/main/protowire/Backup.proto b/app/src/main/protowire/Backup.proto
index 3ae0e294e9..fbb5301963 100644
--- a/app/src/main/protowire/Backup.proto
+++ b/app/src/main/protowire/Backup.proto
@@ -9,6 +9,8 @@ message BackupInfo {
   uint64 version = 1;
   uint64 backupTimeMs = 2;
   bytes mediaRootBackupKey = 3; // 32-byte random value generated when the backup is uploaded for the first time.
+  string currentAppVersion = 4;
+  string firstAppVersion = 5;
 }
 
 // Frames must follow in the following ordering rules:
@@ -134,7 +136,7 @@ message Contact {
     UNVERIFIED = 2;
   }
 
-  message Registered { }
+  message Registered {}
   message NotRegistered {
     uint64 unregisteredTimestamp = 1;
   }
@@ -203,7 +205,7 @@ message Group {
   message GroupAttributeBlob {
     oneof content {
       string title = 1;
-      bytes  avatar = 2;
+      bytes avatar = 2;
       uint32 disappearingMessagesDuration = 3;
       string descriptionText = 4;
     }
@@ -484,7 +486,6 @@ message PaymentNotification {
   optional string feeMob = 2; // stored as a decimal string, e.g. 1.00001
   optional string note = 3;
   TransactionDetails transactionDetails = 4;
-
 }
 
 message GiftBadge {
@@ -507,12 +508,12 @@ message ViewOnceMessage {
 
 message ContactAttachment {
   message Name {
-    optional string givenName = 1;
-    optional string familyName = 2;
-    optional string prefix = 3;
-    optional string suffix = 4;
-    optional string middleName = 5;
-    optional string nickname = 6;
+    string givenName = 1;
+    string familyName = 2;
+    string prefix = 3;
+    string suffix = 4;
+    string middleName = 5;
+    string nickname = 6;
   }
 
   message Phone {
@@ -524,9 +525,9 @@ message ContactAttachment {
       CUSTOM = 4;
     }
 
-    optional string value = 1;
-    optional Type type = 2;
-    optional string label = 3;
+    string value = 1;
+    Type type = 2;
+    string label = 3;
   }
 
   message Email {
@@ -538,9 +539,9 @@ message ContactAttachment {
       CUSTOM = 4;
     }
 
-    optional string value = 1;
-    optional Type type = 2;
-    optional string label = 3;
+    string value = 1;
+    Type type = 2;
+    string label = 3;
   }
 
   message PostalAddress {
@@ -551,15 +552,15 @@ message ContactAttachment {
       CUSTOM = 3;
     }
 
-    optional Type type = 1;
-    optional string label = 2;
-    optional string street = 3;
-    optional string pobox = 4;
-    optional string neighborhood = 5;
-    optional string city = 6;
-    optional string region = 7;
-    optional string postcode = 8;
-    optional string country = 9;
+    Type type = 1;
+    string label = 2;
+    string street = 3;
+    string pobox = 4;
+    string neighborhood = 5;
+    string city = 6;
+    string region = 7;
+    string postcode = 8;
+    string country = 9;
   }
 
   optional Name name = 1;
@@ -567,7 +568,7 @@ message ContactAttachment {
   repeated Email email = 4;
   repeated PostalAddress address = 5;
   optional FilePointer avatar = 6;
-  optional string organization = 7;
+  string organization = 7;
 }
 
 message StickerMessage {
@@ -658,7 +659,7 @@ message FilePointer {
 
   oneof locator {
     BackupLocator backupLocator = 1;
-    AttachmentLocator attachmentLocator= 2;
+    AttachmentLocator attachmentLocator = 2;
     InvalidAttachmentLocator invalidAttachmentLocator = 3;
   }
 
@@ -1069,7 +1070,7 @@ message GroupMemberJoinedByLinkUpdate {
 }
 
 // A gv1->gv2 migration occurred.
-message GroupV2MigrationUpdate  {}
+message GroupV2MigrationUpdate {}
 
 // Another user migrated gv1->gv2 but was unable to add
 // the local user and invited them instead.
@@ -1233,4 +1234,4 @@ message ChatFolder {
   FolderType folderType = 6;
   repeated uint64 includedRecipientIds = 7; // generated recipient id of groups, contacts, and/or note to self
   repeated uint64 excludedRecipientIds = 8; // generated recipient id of groups, contacts, and/or note to self
-}
+}
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0b9e3d09b3..61fe420b81 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.64.0"
+libsignal-client = "0.65.0"
 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 2bc491faa5..c0834fbc58 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -9306,20 +9306,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.64.0">
-         <artifact name="libsignal-android-0.64.0.aar">
-            <sha256 value="f0d9901b2816018e8e8c60d38f94ee501f26a02fb7ab5977a1942eae6ba5dd07" origin="Generated by Gradle"/>
+      <component group="org.signal" name="libsignal-android" version="0.65.0">
+         <artifact name="libsignal-android-0.65.0.aar">
+            <sha256 value="c5aa100e1440bff5a6a5885d5796d712dfb80f25b1ee11f861230950b8816e8b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="libsignal-android-0.64.0.module">
-            <sha256 value="8f2868c61acd35fa3c369ecb20aee06270d25933be69a221a157d64d21425d67" origin="Generated by Gradle"/>
+         <artifact name="libsignal-android-0.65.0.module">
+            <sha256 value="1733fefe84d369f65f7435d7fd5b9ec414ccd840f87827e2a6ca54d2d97e3562" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.signal" name="libsignal-client" version="0.64.0">
-         <artifact name="libsignal-client-0.64.0.jar">
-            <sha256 value="624528d150a10a5fd180e58ea37a4097cfd4a5dfbf1c310105f429aa8d7aa044" origin="Generated by Gradle"/>
+      <component group="org.signal" name="libsignal-client" version="0.65.0">
+         <artifact name="libsignal-client-0.65.0.jar">
+            <sha256 value="56aa32b75c5011f1b7328cead6e070364bb8f315ccd1f8dfac153dcf081f7ea6" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="libsignal-client-0.64.0.module">
-            <sha256 value="518187552d0718e6678f544cd3ab942d1dcd5db6c99912aa613cf306c9ef3417" origin="Generated by Gradle"/>
+         <artifact name="libsignal-client-0.65.0.module">
+            <sha256 value="f4f070a7022305f2e1382ccade4f3691126db3e650d1f39977def6d1aa9532f4" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.signal" name="ringrtc-android" version="2.49.2">
diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV3.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV3.kt
index e10885251c..d152a2f015 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV3.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV3.kt
@@ -9,15 +9,8 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import com.fasterxml.jackson.databind.annotation.JsonSerialize
 import org.signal.core.util.logging.Log
-import org.signal.libsignal.attest.AttestationFailedException
-import org.signal.libsignal.net.EnclaveAuth
 import org.signal.libsignal.net.Network
-import org.signal.libsignal.net.NetworkException
-import org.signal.libsignal.sgxsession.SgxCommunicationFailureException
-import org.signal.libsignal.svr.DataMissingException
-import org.signal.libsignal.svr.RestoreFailedException
 import org.whispersystems.signalservice.api.kbs.MasterKey
-import org.whispersystems.signalservice.api.kbs.PinHashUtil
 import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery.BackupResponse
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery.DeleteResponse
@@ -30,8 +23,6 @@ import org.whispersystems.signalservice.internal.push.ByteArraySerializerBase64N
 import org.whispersystems.signalservice.internal.push.PushServiceSocket
 import org.whispersystems.signalservice.internal.util.JsonUtil
 import java.io.IOException
-import java.util.concurrent.CancellationException
-import java.util.concurrent.ExecutionException
 
 /**
  * An interface for working with V3 of the Secure Value Recovery service.
@@ -86,34 +77,35 @@ class SecureValueRecoveryV3(
    * There's no concept of "deleting" data with SVR3.
    */
   override fun deleteData(): DeleteResponse {
-    val authorization: Svr3Credentials = try {
-      pushServiceSocket.svr3Authorization
-    } catch (e: NonSuccessfulResponseCodeException) {
-      return DeleteResponse.ApplicationError(e)
-    } catch (e: IOException) {
-      return DeleteResponse.NetworkError(e)
-    } catch (e: Exception) {
-      return DeleteResponse.ApplicationError(e)
-    }
-
-    val enclaveAuth = EnclaveAuth(authorization.username, authorization.password)
-
-    return try {
-      network.svr3().remove(enclaveAuth).get()
-      DeleteResponse.Success
-    } catch (e: ExecutionException) {
-      when (val cause = e.cause) {
-        is NetworkException -> DeleteResponse.NetworkError(cause)
-        is AttestationFailedException -> DeleteResponse.ApplicationError(cause)
-        is SgxCommunicationFailureException -> DeleteResponse.ApplicationError(cause)
-        is IOException -> DeleteResponse.NetworkError(cause)
-        else -> DeleteResponse.ApplicationError(cause ?: RuntimeException("Unknown!"))
-      }
-    } catch (e: InterruptedException) {
-      DeleteResponse.ApplicationError(e)
-    } catch (e: CancellationException) {
-      DeleteResponse.ApplicationError(e)
-    }
+    throw UnsupportedOperationException("SVR3 disabled for now")
+//    val authorization: Svr3Credentials = try {
+//      pushServiceSocket.svr3Authorization
+//    } catch (e: NonSuccessfulResponseCodeException) {
+//      return DeleteResponse.ApplicationError(e)
+//    } catch (e: IOException) {
+//      return DeleteResponse.NetworkError(e)
+//    } catch (e: Exception) {
+//      return DeleteResponse.ApplicationError(e)
+//    }
+//
+//    val enclaveAuth = EnclaveAuth(authorization.username, authorization.password)
+//
+//    return try {
+//      network.svr3().remove(enclaveAuth).get()
+//      DeleteResponse.Success
+//    } catch (e: ExecutionException) {
+//      when (val cause = e.cause) {
+//        is NetworkException -> DeleteResponse.NetworkError(cause)
+//        is AttestationFailedException -> DeleteResponse.ApplicationError(cause)
+//        is SgxCommunicationFailureException -> DeleteResponse.ApplicationError(cause)
+//        is IOException -> DeleteResponse.NetworkError(cause)
+//        else -> DeleteResponse.ApplicationError(cause ?: RuntimeException("Unknown!"))
+//      }
+//    } catch (e: InterruptedException) {
+//      DeleteResponse.ApplicationError(e)
+//    } catch (e: CancellationException) {
+//      DeleteResponse.ApplicationError(e)
+//    }
   }
 
   @Throws(IOException::class)
@@ -126,33 +118,34 @@ class SecureValueRecoveryV3(
   }
 
   private fun restoreData(authorization: AuthCredentials, shareSet: ByteArray?, userPin: String): RestoreResponse {
-    if (shareSet == null) {
-      Log.w(TAG, "No share set provided! Assuming no data to restore.")
-      return RestoreResponse.Missing
-    }
-
-    val normalizedPin: String = PinHashUtil.normalizeToString(userPin)
-    val enclaveAuth = EnclaveAuth(authorization.username(), authorization.password())
-
-    return try {
-      val result = network.svr3().restore(normalizedPin, shareSet, enclaveAuth).get()
-      val masterKey = MasterKey(result.value)
-      RestoreResponse.Success(masterKey, authorization)
-    } catch (e: ExecutionException) {
-      when (val cause = e.cause) {
-        is NetworkException -> RestoreResponse.NetworkError(cause)
-        is DataMissingException -> RestoreResponse.Missing
-        is RestoreFailedException -> RestoreResponse.PinMismatch(cause.triesRemaining)
-        is AttestationFailedException -> RestoreResponse.ApplicationError(cause)
-        is SgxCommunicationFailureException -> RestoreResponse.ApplicationError(cause)
-        is IOException -> RestoreResponse.NetworkError(cause)
-        else -> RestoreResponse.ApplicationError(cause ?: RuntimeException("Unknown!"))
-      }
-    } catch (e: InterruptedException) {
-      return RestoreResponse.ApplicationError(e)
-    } catch (e: CancellationException) {
-      return RestoreResponse.ApplicationError(e)
-    }
+    throw UnsupportedOperationException("SVR3 disabled for now")
+//    if (shareSet == null) {
+//      Log.w(TAG, "No share set provided! Assuming no data to restore.")
+//      return RestoreResponse.Missing
+//    }
+//
+//    val normalizedPin: String = PinHashUtil.normalizeToString(userPin)
+//    val enclaveAuth = EnclaveAuth(authorization.username(), authorization.password())
+//
+//    return try {
+//      val result = network.svr3().restore(normalizedPin, shareSet, enclaveAuth).get()
+//      val masterKey = MasterKey(result.value)
+//      RestoreResponse.Success(masterKey, authorization)
+//    } catch (e: ExecutionException) {
+//      when (val cause = e.cause) {
+//        is NetworkException -> RestoreResponse.NetworkError(cause)
+//        is DataMissingException -> RestoreResponse.Missing
+//        is RestoreFailedException -> RestoreResponse.PinMismatch(cause.triesRemaining)
+//        is AttestationFailedException -> RestoreResponse.ApplicationError(cause)
+//        is SgxCommunicationFailureException -> RestoreResponse.ApplicationError(cause)
+//        is IOException -> RestoreResponse.NetworkError(cause)
+//        else -> RestoreResponse.ApplicationError(cause ?: RuntimeException("Unknown!"))
+//      }
+//    } catch (e: InterruptedException) {
+//      return RestoreResponse.ApplicationError(e)
+//    } catch (e: CancellationException) {
+//      return RestoreResponse.ApplicationError(e)
+//    }
   }
 
   private fun Svr3Credentials.toAuthCredential(): AuthCredentials {
@@ -169,47 +162,48 @@ class SecureValueRecoveryV3(
      * Performs the PIN change operation. This is safe to call repeatedly if you get back a retryable error.
      */
     override fun execute(): BackupResponse {
-      val rawAuth: Svr3Credentials = try {
-        pushServiceSocket.svr3Authorization
-      } catch (e: NonSuccessfulResponseCodeException) {
-        return BackupResponse.ApplicationError(e)
-      } catch (e: IOException) {
-        return BackupResponse.NetworkError(e)
-      } catch (e: Exception) {
-        return BackupResponse.ApplicationError(e)
-      }
-
-      if (shareSet == null) {
-        val normalizedPin: String = PinHashUtil.normalizeToString(userPin)
-        val enclaveAuth = EnclaveAuth(rawAuth.username, rawAuth.password)
-
-        try {
-          shareSet = network.svr3().backup(masterKey.serialize(), normalizedPin, 10, enclaveAuth).get()
-        } catch (e: ExecutionException) {
-          when (val cause = e.cause) {
-            is NetworkException -> BackupResponse.NetworkError(cause)
-            is AttestationFailedException -> BackupResponse.ApplicationError(cause)
-            is SgxCommunicationFailureException -> BackupResponse.ApplicationError(cause)
-            is IOException -> BackupResponse.NetworkError(cause)
-            else -> BackupResponse.ApplicationError(cause ?: RuntimeException("Unknown!"))
-          }
-        } catch (e: InterruptedException) {
-          BackupResponse.ApplicationError(e)
-        } catch (e: CancellationException) {
-          BackupResponse.ApplicationError(e)
-        }
-      }
-
-      return try {
-        pushServiceSocket.setShareSet(shareSet)
-        BackupResponse.Success(masterKey, pushServiceSocket.svr3Authorization.toAuthCredential(), SvrVersion.SVR3)
-      } catch (e: NonSuccessfulResponseCodeException) {
-        BackupResponse.ApplicationError(e)
-      } catch (e: IOException) {
-        BackupResponse.NetworkError(e)
-      } catch (e: Exception) {
-        return BackupResponse.ApplicationError(e)
-      }
+      throw UnsupportedOperationException("SVR3 disabled for now")
+//      val rawAuth: Svr3Credentials = try {
+//        pushServiceSocket.svr3Authorization
+//      } catch (e: NonSuccessfulResponseCodeException) {
+//        return BackupResponse.ApplicationError(e)
+//      } catch (e: IOException) {
+//        return BackupResponse.NetworkError(e)
+//      } catch (e: Exception) {
+//        return BackupResponse.ApplicationError(e)
+//      }
+//
+//      if (shareSet == null) {
+//        val normalizedPin: String = PinHashUtil.normalizeToString(userPin)
+//        val enclaveAuth = EnclaveAuth(rawAuth.username, rawAuth.password)
+//
+//        try {
+//          shareSet = network.svr3().backup(masterKey.serialize(), normalizedPin, 10, enclaveAuth).get()
+//        } catch (e: ExecutionException) {
+//          when (val cause = e.cause) {
+//            is NetworkException -> BackupResponse.NetworkError(cause)
+//            is AttestationFailedException -> BackupResponse.ApplicationError(cause)
+//            is SgxCommunicationFailureException -> BackupResponse.ApplicationError(cause)
+//            is IOException -> BackupResponse.NetworkError(cause)
+//            else -> BackupResponse.ApplicationError(cause ?: RuntimeException("Unknown!"))
+//          }
+//        } catch (e: InterruptedException) {
+//          BackupResponse.ApplicationError(e)
+//        } catch (e: CancellationException) {
+//          BackupResponse.ApplicationError(e)
+//        }
+//      }
+//
+//      return try {
+//        pushServiceSocket.setShareSet(shareSet)
+//        BackupResponse.Success(masterKey, pushServiceSocket.svr3Authorization.toAuthCredential(), SvrVersion.SVR3)
+//      } catch (e: NonSuccessfulResponseCodeException) {
+//        BackupResponse.ApplicationError(e)
+//      } catch (e: IOException) {
+//        BackupResponse.NetworkError(e)
+//      } catch (e: Exception) {
+//        return BackupResponse.ApplicationError(e)
+//      }
     }
 
     override fun serialize(): String {