diff --git a/app/src/androidTest/assets/backupTests/chat_item_pin_message_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_pin_message_00.binproto
index a96688c735..198fa0a241 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_pin_message_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_pin_message_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_pin_message_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_pin_message_01.binproto
index 792d27adbb..21ed2052aa 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_pin_message_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_pin_message_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_pin_message_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_pin_message_02.binproto
index 965871c3d0..40c26d7031 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_pin_message_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_pin_message_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_pin_message_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_pin_message_04.binproto
index 97551849da..f4ee40c27d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_pin_message_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_pin_message_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_pin_message_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_pin_message_05.binproto
index 84a59a5f8a..59a4b3374e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_pin_message_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_pin_message_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_pin_message_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_pin_message_06.binproto
index b5f6cb4b8b..af17f93db3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_pin_message_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_pin_message_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_pin_message_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_pin_message_07.binproto
index e01da9152f..775e73f35b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_pin_message_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_pin_message_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_pin_message_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_pin_message_08.binproto
index 0f2a19e12e..dbd94ac10d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_pin_message_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_pin_message_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_pin_message_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_pin_message_10.binproto
index 5fc8a46663..dea7960876 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_pin_message_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_pin_message_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_pin_message_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_pin_message_11.binproto
index de882d21cf..2ff3b9d80d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_pin_message_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_pin_message_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_pin_message_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_pin_message_12.binproto
index 27e66f69fb..b57341933a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_pin_message_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_pin_message_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_pin_message_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_pin_message_13.binproto
index 6ad0a86d67..a297273c6f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_pin_message_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_pin_message_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_pin_message_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_pin_message_14.binproto
index d097900482..c89ab7993a 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_pin_message_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_pin_message_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_00.binproto
index d69e662653..a33502a1be 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_01.binproto
index 9fc148f705..7c47c4ba04 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 90563c72d1..fd4d61ebc8 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_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_04.binproto
index 71c920ab2f..b37ad73d01 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 0f04cc19d1..41b8a49c83 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_06.binproto
index 0e594833e0..222a7b120b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_07.binproto
index 2bae670c95..f4a9195a2e 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 04ceaad11c..0837b0312b 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_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_10.binproto
index 278be57582..8654c11e06 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 21eef3142e..d6c20594c3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_12.binproto
index 9c5295e064..6db07bdb87 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_13.binproto
index 797b60463e..f917be9a6f 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 7a5d9f30ce..f0d5b24eca 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_00.binproto
index d69e662653..a33502a1be 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_01.binproto
index 9fc148f705..7c47c4ba04 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_02.binproto
index 90563c72d1..fd4d61ebc8 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_04.binproto
index 71c920ab2f..b37ad73d01 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_05.binproto
index 0f04cc19d1..41b8a49c83 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_06.binproto
index 0e594833e0..222a7b120b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_06.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_07.binproto
index 2bae670c95..f4a9195a2e 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_08.binproto
index 04ceaad11c..0837b0312b 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_10.binproto
index 278be57582..8654c11e06 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_11.binproto
index 21eef3142e..d6c20594c3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_11.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_12.binproto
index 9c5295e064..6db07bdb87 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_12.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_13.binproto
index 797b60463e..f917be9a6f 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_14.binproto
index 7a5d9f30ce..f0d5b24eca 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_standard_attachments_incremental_mac_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_01.binproto
index 7ea3495275..09e76a8946 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_02.binproto
index 629d56a764..e0b7a8253c 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_05.binproto
index c8a567d938..8b26bed240 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_quote_05.binproto differ