diff --git a/app/src/androidTest/assets/backupTests/account_data_00.binproto b/app/src/androidTest/assets/backupTests/account_data_00.binproto
new file mode 100644
index 0000000000..5d75cf9f56
Binary files /dev/null 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
new file mode 100644
index 0000000000..5e63d535c2
Binary files /dev/null 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
new file mode 100644
index 0000000000..3e6bef8abe
Binary files /dev/null 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
new file mode 100644
index 0000000000..ebf263b9d9
Binary files /dev/null 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
new file mode 100644
index 0000000000..bfda3a7616
Binary files /dev/null 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
new file mode 100644
index 0000000000..f96b4258dd
Binary files /dev/null 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
new file mode 100644
index 0000000000..f23ab949e6
Binary files /dev/null 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
new file mode 100644
index 0000000000..9d2312ccb1
Binary files /dev/null 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
new file mode 100644
index 0000000000..93d4ca921f
Binary files /dev/null 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
new file mode 100644
index 0000000000..a4558f6fb6
Binary files /dev/null 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
new file mode 100644
index 0000000000..787f20d52f
Binary files /dev/null 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
new file mode 100644
index 0000000000..fa48dc6264
Binary files /dev/null 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
new file mode 100644
index 0000000000..b3b16d9f42
Binary files /dev/null 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
new file mode 100644
index 0000000000..ca8130ae6c
Binary files /dev/null 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
new file mode 100644
index 0000000000..e7e056445c
Binary files /dev/null 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
new file mode 100644
index 0000000000..343e27523f
Binary files /dev/null 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
new file mode 100644
index 0000000000..fc98294a55
Binary files /dev/null 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
new file mode 100644
index 0000000000..7a59a2e944
Binary files /dev/null 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
new file mode 100644
index 0000000000..3e3c420882
Binary files /dev/null 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
new file mode 100644
index 0000000000..a55aa1a34f
Binary files /dev/null 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
new file mode 100644
index 0000000000..f198492f69
Binary files /dev/null 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
new file mode 100644
index 0000000000..5f8a7af457
Binary files /dev/null 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
new file mode 100644
index 0000000000..782546a80b
Binary files /dev/null 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
new file mode 100644
index 0000000000..3cb8d26b90
Binary files /dev/null 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
new file mode 100644
index 0000000000..ba1331c6c1
Binary files /dev/null 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
new file mode 100644
index 0000000000..cc65a08903
Binary files /dev/null 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
new file mode 100644
index 0000000000..7f8b37263f
Binary files /dev/null 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
new file mode 100644
index 0000000000..6b547a0bf1
Binary files /dev/null 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
new file mode 100644
index 0000000000..8750a901b8
Binary files /dev/null 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
new file mode 100644
index 0000000000..6042301f50
Binary files /dev/null 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
new file mode 100644
index 0000000000..81ad3568ee
Binary files /dev/null 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
new file mode 100644
index 0000000000..77105521e9
Binary files /dev/null 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
new file mode 100644
index 0000000000..d8aa949dc6
Binary files /dev/null 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
new file mode 100644
index 0000000000..0e5e9a8c72
Binary files /dev/null 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
new file mode 100644
index 0000000000..06e7fb1855
Binary files /dev/null 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
new file mode 100644
index 0000000000..bbc9a5a933
Binary files /dev/null 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
new file mode 100644
index 0000000000..dfac107868
Binary files /dev/null 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
new file mode 100644
index 0000000000..bf24d36e22
Binary files /dev/null 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
new file mode 100644
index 0000000000..a214806d01
Binary files /dev/null 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
new file mode 100644
index 0000000000..77498fcec3
Binary files /dev/null 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
new file mode 100644
index 0000000000..1f0cc7a88c
Binary files /dev/null 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
new file mode 100644
index 0000000000..be00d61092
Binary files /dev/null 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
new file mode 100644
index 0000000000..aad2d79f04
Binary files /dev/null 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
new file mode 100644
index 0000000000..a96a84eca7
Binary files /dev/null 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
new file mode 100644
index 0000000000..cb836a7078
Binary files /dev/null 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
new file mode 100644
index 0000000000..8c50c2b5d4
Binary files /dev/null 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
new file mode 100644
index 0000000000..7d63bddc06
Binary files /dev/null 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
new file mode 100644
index 0000000000..182a6f1a39
Binary files /dev/null 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
new file mode 100644
index 0000000000..afbbcc53e4
Binary files /dev/null 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
new file mode 100644
index 0000000000..3daa1d5069
Binary files /dev/null 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
new file mode 100644
index 0000000000..91dd622cf3
Binary files /dev/null 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
new file mode 100644
index 0000000000..5c9a21b24c
Binary files /dev/null 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
new file mode 100644
index 0000000000..f9dc758d70
Binary files /dev/null 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
new file mode 100644
index 0000000000..21fe571267
Binary files /dev/null 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
new file mode 100644
index 0000000000..b9d6bf880d
Binary files /dev/null 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
new file mode 100644
index 0000000000..f5df8c2a40
Binary files /dev/null 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
new file mode 100644
index 0000000000..8bc8d3b228
Binary files /dev/null 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
new file mode 100644
index 0000000000..750fcfc253
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_26.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
new file mode 100644
index 0000000000..77991a7f10
Binary files /dev/null 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
new file mode 100644
index 0000000000..ba6116d77a
Binary files /dev/null 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
new file mode 100644
index 0000000000..747658d6e8
Binary files /dev/null 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
new file mode 100644
index 0000000000..d3ce053377
Binary files /dev/null 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
new file mode 100644
index 0000000000..aa2bd5e3fd
Binary files /dev/null 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
new file mode 100644
index 0000000000..634fa201e3
Binary files /dev/null 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
new file mode 100644
index 0000000000..88df37f605
Binary files /dev/null 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
new file mode 100644
index 0000000000..728843a716
Binary files /dev/null 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
new file mode 100644
index 0000000000..19e67ee4fa
Binary files /dev/null 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
new file mode 100644
index 0000000000..26791d0edc
Binary files /dev/null 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
new file mode 100644
index 0000000000..89a5afb063
Binary files /dev/null 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
new file mode 100644
index 0000000000..2326bea64c
Binary files /dev/null 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
new file mode 100644
index 0000000000..5d749a5188
Binary files /dev/null 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
new file mode 100644
index 0000000000..04380d9e53
Binary files /dev/null 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
new file mode 100644
index 0000000000..8bce91dae4
Binary files /dev/null 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
new file mode 100644
index 0000000000..3249c59223
Binary files /dev/null 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
new file mode 100644
index 0000000000..e3bcec8106
Binary files /dev/null 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
new file mode 100644
index 0000000000..6a0551bb3c
Binary files /dev/null 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
new file mode 100644
index 0000000000..2f4793110f
Binary files /dev/null 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
new file mode 100644
index 0000000000..c560051d45
Binary files /dev/null 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
new file mode 100644
index 0000000000..5e65a953b9
Binary files /dev/null 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
new file mode 100644
index 0000000000..ff6208589d
Binary files /dev/null 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
new file mode 100644
index 0000000000..01f2a949da
Binary files /dev/null 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
new file mode 100644
index 0000000000..33d0bc77b7
Binary files /dev/null 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
new file mode 100644
index 0000000000..077bafdb1d
Binary files /dev/null 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
new file mode 100644
index 0000000000..262cb332cd
Binary files /dev/null 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
new file mode 100644
index 0000000000..24a2177e4b
Binary files /dev/null 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
new file mode 100644
index 0000000000..4b8cf18039
Binary files /dev/null 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
new file mode 100644
index 0000000000..856f1db7d0
Binary files /dev/null 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
new file mode 100644
index 0000000000..9d095aad03
Binary files /dev/null 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
new file mode 100644
index 0000000000..f7832df85a
Binary files /dev/null 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
new file mode 100644
index 0000000000..dce5959cbe
Binary files /dev/null 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
new file mode 100644
index 0000000000..c08c4f261b
Binary files /dev/null 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
new file mode 100644
index 0000000000..dcf9ac40d6
Binary files /dev/null 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
new file mode 100644
index 0000000000..df3844cdcc
Binary files /dev/null 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
new file mode 100644
index 0000000000..fe7bbf6bcb
Binary files /dev/null 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
new file mode 100644
index 0000000000..82bc99417f
Binary files /dev/null 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
new file mode 100644
index 0000000000..3be234be44
Binary files /dev/null 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
new file mode 100644
index 0000000000..2829afb4a6
Binary files /dev/null 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
new file mode 100644
index 0000000000..68d8117958
Binary files /dev/null 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
new file mode 100644
index 0000000000..9d9496782c
Binary files /dev/null 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_individual_call_update_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_individual_call_update_00.binproto
new file mode 100644
index 0000000000..2732d155ec
Binary files /dev/null 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
new file mode 100644
index 0000000000..040f71df29
Binary files /dev/null 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
new file mode 100644
index 0000000000..143e0efced
Binary files /dev/null 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
new file mode 100644
index 0000000000..e4740c00b6
Binary files /dev/null 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
new file mode 100644
index 0000000000..bc9239855c
Binary files /dev/null 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
new file mode 100644
index 0000000000..0718662d2e
Binary files /dev/null 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
new file mode 100644
index 0000000000..baf3a7edf5
Binary files /dev/null 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
new file mode 100644
index 0000000000..f96a632e34
Binary files /dev/null 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
new file mode 100644
index 0000000000..879aa81db6
Binary files /dev/null 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
new file mode 100644
index 0000000000..67afc34bef
Binary files /dev/null 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
new file mode 100644
index 0000000000..684e7ff013
Binary files /dev/null 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
new file mode 100644
index 0000000000..472abecbdc
Binary files /dev/null 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
new file mode 100644
index 0000000000..b1b1434aaf
Binary files /dev/null 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
new file mode 100644
index 0000000000..cc0beceaca
Binary files /dev/null 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
new file mode 100644
index 0000000000..7f790cdddb
Binary files /dev/null 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
new file mode 100644
index 0000000000..0ac23ccd1b
Binary files /dev/null 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
new file mode 100644
index 0000000000..192e256b7c
Binary files /dev/null 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
new file mode 100644
index 0000000000..0b29a353b2
Binary files /dev/null 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
new file mode 100644
index 0000000000..8f7ea90852
Binary files /dev/null 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
new file mode 100644
index 0000000000..4345a63c44
Binary files /dev/null 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
new file mode 100644
index 0000000000..e91fb31bfc
Binary files /dev/null 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
new file mode 100644
index 0000000000..c5830360e3
Binary files /dev/null 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
new file mode 100644
index 0000000000..5c1dee4ae2
Binary files /dev/null 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
new file mode 100644
index 0000000000..e47d835bfb
Binary files /dev/null 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
new file mode 100644
index 0000000000..b6a7baaef4
Binary files /dev/null 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
new file mode 100644
index 0000000000..4dd5d18a14
Binary files /dev/null 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
new file mode 100644
index 0000000000..c9ad0d272b
Binary files /dev/null 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
new file mode 100644
index 0000000000..64174c651d
Binary files /dev/null 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
new file mode 100644
index 0000000000..756e33d12f
Binary files /dev/null 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
new file mode 100644
index 0000000000..4210317c50
Binary files /dev/null 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
new file mode 100644
index 0000000000..4a906cf0df
Binary files /dev/null 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
new file mode 100644
index 0000000000..96d168d2f4
Binary files /dev/null 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
new file mode 100644
index 0000000000..b71677dd4c
Binary files /dev/null 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
new file mode 100644
index 0000000000..1a120d33db
Binary files /dev/null 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
new file mode 100644
index 0000000000..3f4e9a8666
Binary files /dev/null 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
new file mode 100644
index 0000000000..298ac13d17
Binary files /dev/null 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
new file mode 100644
index 0000000000..313296e488
Binary files /dev/null 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
new file mode 100644
index 0000000000..17ad297df4
Binary files /dev/null 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
new file mode 100644
index 0000000000..f4f7d2222d
Binary files /dev/null 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
new file mode 100644
index 0000000000..870ac8d8cb
Binary files /dev/null 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
new file mode 100644
index 0000000000..a4bd82ca4a
Binary files /dev/null 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
new file mode 100644
index 0000000000..7d14f5b67d
Binary files /dev/null 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
new file mode 100644
index 0000000000..44cecda13b
Binary files /dev/null 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
new file mode 100644
index 0000000000..d678c1f484
Binary files /dev/null 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
new file mode 100644
index 0000000000..5f0f8a0468
Binary files /dev/null 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
new file mode 100644
index 0000000000..d4598661b3
Binary files /dev/null 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
new file mode 100644
index 0000000000..8c67432144
Binary files /dev/null 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
new file mode 100644
index 0000000000..b2dd35289d
Binary files /dev/null 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
new file mode 100644
index 0000000000..4c68339a9e
Binary files /dev/null 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
new file mode 100644
index 0000000000..439cd6d00c
Binary files /dev/null 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
new file mode 100644
index 0000000000..cdc8542634
Binary files /dev/null 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
new file mode 100644
index 0000000000..620a6217dc
Binary files /dev/null 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
new file mode 100644
index 0000000000..0cf5d7e5c4
Binary files /dev/null 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
new file mode 100644
index 0000000000..6625c7e753
Binary files /dev/null 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
new file mode 100644
index 0000000000..437a74cddf
Binary files /dev/null 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
new file mode 100644
index 0000000000..62fdb8f36d
Binary files /dev/null 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
new file mode 100644
index 0000000000..ea315edc29
Binary files /dev/null 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
new file mode 100644
index 0000000000..78b7e127c3
Binary files /dev/null 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
new file mode 100644
index 0000000000..ed94fb5826
Binary files /dev/null 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
new file mode 100644
index 0000000000..bee6dd31ab
Binary files /dev/null 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
new file mode 100644
index 0000000000..8a26095211
Binary files /dev/null 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
new file mode 100644
index 0000000000..5dd7e008f2
Binary files /dev/null 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
new file mode 100644
index 0000000000..fd669c9aee
Binary files /dev/null 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
new file mode 100644
index 0000000000..adff8a14e9
Binary files /dev/null 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
new file mode 100644
index 0000000000..74a94953fb
Binary files /dev/null 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
new file mode 100644
index 0000000000..e7582d921f
Binary files /dev/null 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
new file mode 100644
index 0000000000..d6f669f8d9
Binary files /dev/null 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
new file mode 100644
index 0000000000..ef229c2044
Binary files /dev/null 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
new file mode 100644
index 0000000000..057f782ce4
Binary files /dev/null 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
new file mode 100644
index 0000000000..2576fc4442
Binary files /dev/null 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
new file mode 100644
index 0000000000..77c780b77d
Binary files /dev/null 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
new file mode 100644
index 0000000000..b37a6c5e2c
Binary files /dev/null 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
new file mode 100644
index 0000000000..5b2351bcea
Binary files /dev/null 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
new file mode 100644
index 0000000000..bc69c63469
Binary files /dev/null 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
new file mode 100644
index 0000000000..264a19e3ee
Binary files /dev/null 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
new file mode 100644
index 0000000000..ffe1664f63
Binary files /dev/null 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
new file mode 100644
index 0000000000..393b15e551
Binary files /dev/null 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
new file mode 100644
index 0000000000..b5a73ddb95
Binary files /dev/null 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
new file mode 100644
index 0000000000..4ee50a7adf
Binary files /dev/null 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
new file mode 100644
index 0000000000..9c6bb90f0e
Binary files /dev/null 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
new file mode 100644
index 0000000000..72859c641a
Binary files /dev/null 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
new file mode 100644
index 0000000000..3cbac399cf
Binary files /dev/null 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
new file mode 100644
index 0000000000..2d83e9f813
Binary files /dev/null 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
new file mode 100644
index 0000000000..535fe73ac1
Binary files /dev/null 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
new file mode 100644
index 0000000000..f5e75099c1
Binary files /dev/null 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
new file mode 100644
index 0000000000..51207f0414
Binary files /dev/null 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
new file mode 100644
index 0000000000..fed7adf80f
Binary files /dev/null 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
new file mode 100644
index 0000000000..e3a18d87b6
Binary files /dev/null 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
new file mode 100644
index 0000000000..021e019e95
Binary files /dev/null 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
new file mode 100644
index 0000000000..1dd8e1928e
Binary files /dev/null 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
new file mode 100644
index 0000000000..89acd28507
Binary files /dev/null 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
new file mode 100644
index 0000000000..bc40479433
Binary files /dev/null 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
new file mode 100644
index 0000000000..c6727cc931
Binary files /dev/null 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
new file mode 100644
index 0000000000..c38bcf0b6e
Binary files /dev/null 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
new file mode 100644
index 0000000000..9c3363da74
Binary files /dev/null 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
new file mode 100644
index 0000000000..fb62ed6db3
Binary files /dev/null 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
new file mode 100644
index 0000000000..88f5876739
Binary files /dev/null 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
new file mode 100644
index 0000000000..03ae657477
Binary files /dev/null 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
new file mode 100644
index 0000000000..a76900cadb
Binary files /dev/null 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
new file mode 100644
index 0000000000..3f85afa995
Binary files /dev/null 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
new file mode 100644
index 0000000000..3595c0db3c
Binary files /dev/null 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
new file mode 100644
index 0000000000..cc6c23947f
Binary files /dev/null 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
new file mode 100644
index 0000000000..ab836778d9
Binary files /dev/null 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
new file mode 100644
index 0000000000..dccc7a1533
Binary files /dev/null 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
new file mode 100644
index 0000000000..9cdaa5c582
Binary files /dev/null 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
new file mode 100644
index 0000000000..56317caa45
Binary files /dev/null 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
new file mode 100644
index 0000000000..f1ae7bd587
Binary files /dev/null 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
new file mode 100644
index 0000000000..32db730ebf
Binary files /dev/null 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
new file mode 100644
index 0000000000..2cf3aaf019
Binary files /dev/null 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
new file mode 100644
index 0000000000..c2b9ec44b9
Binary files /dev/null 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
new file mode 100644
index 0000000000..cde976e242
Binary files /dev/null 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
new file mode 100644
index 0000000000..12d3c2c691
Binary files /dev/null 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
new file mode 100644
index 0000000000..7e652aee66
Binary files /dev/null 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
new file mode 100644
index 0000000000..0238324a5b
Binary files /dev/null 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
new file mode 100644
index 0000000000..a43b5426ef
Binary files /dev/null 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
new file mode 100644
index 0000000000..df981ce80a
Binary files /dev/null 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
new file mode 100644
index 0000000000..49c8284247
Binary files /dev/null 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
new file mode 100644
index 0000000000..97c14a3032
Binary files /dev/null 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
new file mode 100644
index 0000000000..8a3e43f4cd
Binary files /dev/null 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
new file mode 100644
index 0000000000..6cc583112d
Binary files /dev/null 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
new file mode 100644
index 0000000000..d273f786f3
Binary files /dev/null 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
new file mode 100644
index 0000000000..346ff1df3c
Binary files /dev/null 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
new file mode 100644
index 0000000000..387d4ca177
Binary files /dev/null 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
new file mode 100644
index 0000000000..4889a2117c
Binary files /dev/null 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
new file mode 100644
index 0000000000..75d8f06d87
Binary files /dev/null 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
new file mode 100644
index 0000000000..09cc7486e6
Binary files /dev/null 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
new file mode 100644
index 0000000000..03410bad61
Binary files /dev/null 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
new file mode 100644
index 0000000000..8deca89936
Binary files /dev/null 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
new file mode 100644
index 0000000000..c140003bdb
Binary files /dev/null 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
new file mode 100644
index 0000000000..daf5673023
Binary files /dev/null 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
new file mode 100644
index 0000000000..053fc36bda
Binary files /dev/null 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
new file mode 100644
index 0000000000..bb3491070e
Binary files /dev/null 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
new file mode 100644
index 0000000000..dcc1d38c38
Binary files /dev/null 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
new file mode 100644
index 0000000000..dfe30e623a
Binary files /dev/null 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
new file mode 100644
index 0000000000..a6b9b79dae
Binary files /dev/null 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
new file mode 100644
index 0000000000..c897976023
Binary files /dev/null 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
new file mode 100644
index 0000000000..ac2ab391cd
Binary files /dev/null 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
new file mode 100644
index 0000000000..9f46cbd01d
Binary files /dev/null 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
new file mode 100644
index 0000000000..019549a827
Binary files /dev/null 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
new file mode 100644
index 0000000000..54ecd6c869
Binary files /dev/null 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
new file mode 100644
index 0000000000..4d3bf60b65
Binary files /dev/null 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
new file mode 100644
index 0000000000..3ba1862695
Binary files /dev/null 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
new file mode 100644
index 0000000000..13c2455210
Binary files /dev/null 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
new file mode 100644
index 0000000000..a6bd4ca5d3
Binary files /dev/null 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
new file mode 100644
index 0000000000..5256397ee0
Binary files /dev/null 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
new file mode 100644
index 0000000000..087fab31b8
Binary files /dev/null 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
new file mode 100644
index 0000000000..9ffa624a96
Binary files /dev/null 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
new file mode 100644
index 0000000000..1f6763414d
Binary files /dev/null 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
new file mode 100644
index 0000000000..d95c3c4b97
Binary files /dev/null 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
new file mode 100644
index 0000000000..0f2e5ac20b
Binary files /dev/null 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
new file mode 100644
index 0000000000..90f54656b0
Binary files /dev/null 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
new file mode 100644
index 0000000000..58c19d484b
Binary files /dev/null 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
new file mode 100644
index 0000000000..a058f62b51
Binary files /dev/null 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
new file mode 100644
index 0000000000..97e9c6189a
Binary files /dev/null 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
new file mode 100644
index 0000000000..3247a561b2
Binary files /dev/null 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
new file mode 100644
index 0000000000..770507fc91
Binary files /dev/null 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
new file mode 100644
index 0000000000..5d71032388
Binary files /dev/null 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
new file mode 100644
index 0000000000..afcf4be4b4
Binary files /dev/null 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
new file mode 100644
index 0000000000..cb6b1753f1
Binary files /dev/null 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
new file mode 100644
index 0000000000..b42529a971
Binary files /dev/null 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
new file mode 100644
index 0000000000..4de1f306f1
Binary files /dev/null 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
new file mode 100644
index 0000000000..e856d5d180
Binary files /dev/null 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
new file mode 100644
index 0000000000..325dceb704
Binary files /dev/null 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
new file mode 100644
index 0000000000..b81127c3b4
Binary files /dev/null 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
new file mode 100644
index 0000000000..f4d0d5602d
Binary files /dev/null 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
new file mode 100644
index 0000000000..abe721a845
Binary files /dev/null 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
new file mode 100644
index 0000000000..0c5369be5b
Binary files /dev/null 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
new file mode 100644
index 0000000000..735236acc0
Binary files /dev/null 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
new file mode 100644
index 0000000000..d6a02f8219
Binary files /dev/null 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
new file mode 100644
index 0000000000..1c9329854f
Binary files /dev/null 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
new file mode 100644
index 0000000000..37973a913f
Binary files /dev/null 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
new file mode 100644
index 0000000000..2aae319620
Binary files /dev/null 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
new file mode 100644
index 0000000000..017223ec4c
Binary files /dev/null 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
new file mode 100644
index 0000000000..8ef246b191
Binary files /dev/null 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
new file mode 100644
index 0000000000..d64bf938db
Binary files /dev/null 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
new file mode 100644
index 0000000000..3a8c68f6a0
Binary files /dev/null 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
new file mode 100644
index 0000000000..5ccbb4fbe2
Binary files /dev/null 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
new file mode 100644
index 0000000000..faf4244b8f
Binary files /dev/null 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
new file mode 100644
index 0000000000..2a5e665d64
Binary files /dev/null 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
new file mode 100644
index 0000000000..ce95c97deb
Binary files /dev/null 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
new file mode 100644
index 0000000000..2634c90ffc
Binary files /dev/null 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
new file mode 100644
index 0000000000..76992f7e93
Binary files /dev/null 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
new file mode 100644
index 0000000000..ecbf601561
Binary files /dev/null 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
new file mode 100644
index 0000000000..c20e9901a3
Binary files /dev/null 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
new file mode 100644
index 0000000000..162dd6616f
Binary files /dev/null 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
new file mode 100644
index 0000000000..90dc6b1d1a
Binary files /dev/null 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
new file mode 100644
index 0000000000..cb801a5ea0
Binary files /dev/null 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
new file mode 100644
index 0000000000..d8b128833b
Binary files /dev/null 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
new file mode 100644
index 0000000000..149d832d07
Binary files /dev/null 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
new file mode 100644
index 0000000000..fe76d98ea6
Binary files /dev/null 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
new file mode 100644
index 0000000000..035c8a670e
Binary files /dev/null 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
new file mode 100644
index 0000000000..623a0a2fb5
Binary files /dev/null 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
new file mode 100644
index 0000000000..10d9fc2cd6
Binary files /dev/null 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
new file mode 100644
index 0000000000..39fddf975f
Binary files /dev/null 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
new file mode 100644
index 0000000000..c15b8a845f
Binary files /dev/null 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
new file mode 100644
index 0000000000..6f34c61781
Binary files /dev/null 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
new file mode 100644
index 0000000000..3bd7662d07
Binary files /dev/null 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
new file mode 100644
index 0000000000..abebdca877
Binary files /dev/null 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
new file mode 100644
index 0000000000..713104542c
Binary files /dev/null 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
new file mode 100644
index 0000000000..0b9568999c
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_thread_merge_update_01.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
new file mode 100644
index 0000000000..22a78198d4
Binary files /dev/null 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
new file mode 100644
index 0000000000..24da3a2a19
Binary files /dev/null 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
new file mode 100644
index 0000000000..ea383556f2
Binary files /dev/null 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
new file mode 100644
index 0000000000..179ab70f19
Binary files /dev/null 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
new file mode 100644
index 0000000000..a33ccd6cb9
Binary files /dev/null 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
new file mode 100644
index 0000000000..87392103d6
Binary files /dev/null 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
new file mode 100644
index 0000000000..22a78198d4
Binary files /dev/null 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
new file mode 100644
index 0000000000..24da3a2a19
Binary files /dev/null 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
new file mode 100644
index 0000000000..ea383556f2
Binary files /dev/null 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
new file mode 100644
index 0000000000..179ab70f19
Binary files /dev/null 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
new file mode 100644
index 0000000000..a33ccd6cb9
Binary files /dev/null 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
new file mode 100644
index 0000000000..87392103d6
Binary files /dev/null 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
new file mode 100644
index 0000000000..22a78198d4
Binary files /dev/null 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
new file mode 100644
index 0000000000..24da3a2a19
Binary files /dev/null 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
new file mode 100644
index 0000000000..ea383556f2
Binary files /dev/null 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
new file mode 100644
index 0000000000..179ab70f19
Binary files /dev/null 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
new file mode 100644
index 0000000000..01673fc0d3
Binary files /dev/null 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
new file mode 100644
index 0000000000..abb2914329
Binary files /dev/null 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
new file mode 100644
index 0000000000..008d6513be
Binary files /dev/null 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
new file mode 100644
index 0000000000..8d398f3e06
Binary files /dev/null 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
new file mode 100644
index 0000000000..e092219642
Binary files /dev/null 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
new file mode 100644
index 0000000000..63d9dfc8e4
Binary files /dev/null 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
new file mode 100644
index 0000000000..4161d7d9f9
Binary files /dev/null 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
new file mode 100644
index 0000000000..044ffbfc7f
Binary files /dev/null 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
new file mode 100644
index 0000000000..9eeb9ed7ba
Binary files /dev/null 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
new file mode 100644
index 0000000000..6e8d40014e
Binary files /dev/null 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
new file mode 100644
index 0000000000..e031662d1e
Binary files /dev/null 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
new file mode 100644
index 0000000000..0d8e0e500e
Binary files /dev/null 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
new file mode 100644
index 0000000000..117dbc6b8c
Binary files /dev/null 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
new file mode 100644
index 0000000000..fa7f31b98f
Binary files /dev/null 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
new file mode 100644
index 0000000000..fa7f31b98f
Binary files /dev/null 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
new file mode 100644
index 0000000000..fa7f31b98f
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/sticker_pack_02.binproto differ