diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_01.binproto
index b95a5b943f..a76036702a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_02.binproto
index 5c322b577c..316c2797eb 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_03.binproto
index 8e02f01949..a96b761f5d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_04.binproto
index 147b5db24d..6238875bdc 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_05.binproto
index a673118529..d2b5c0d777 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_07.binproto
index 9aef0778e4..b6c6abb734 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_08.binproto
index 73f8124ba9..e56045f7de 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_09.binproto
index 4d83dbae0a..0aea65214d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_10.binproto
index 40bafc3bde..31f1fb0c37 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_11.binproto
index 0f985f7756..5bc6dec421 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_13.binproto
index 8572fa6781..d7b08a2efb 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_14.binproto
index 06a6d0d03a..d2cd81ebda 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_00.binproto
new file mode 100644
index 0000000000..4b3bcdeea4
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_01.binproto
new file mode 100644
index 0000000000..b95a5b943f
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_02.binproto
new file mode 100644
index 0000000000..5c322b577c
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_03.binproto
new file mode 100644
index 0000000000..8e02f01949
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_04.binproto
new file mode 100644
index 0000000000..147b5db24d
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_05.binproto
new file mode 100644
index 0000000000..a673118529
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_06.binproto
new file mode 100644
index 0000000000..5d05bd46d2
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_07.binproto
new file mode 100644
index 0000000000..9aef0778e4
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_08.binproto
new file mode 100644
index 0000000000..73f8124ba9
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_09.binproto
new file mode 100644
index 0000000000..4d83dbae0a
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_10.binproto
new file mode 100644
index 0000000000..40bafc3bde
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_11.binproto
new file mode 100644
index 0000000000..0f985f7756
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_12.binproto
new file mode 100644
index 0000000000..738a6ce2cf
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_13.binproto
new file mode 100644
index 0000000000..8572fa6781
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_14.binproto
new file mode 100644
index 0000000000..06a6d0d03a
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_02.binproto
index c9ff39ef4b..09fd9aba61 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_02.binproto differ