diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_01.binproto
index c8b550e0cd..2ef08a0a98 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_02.binproto
index 854ebcc981..a5d3a93233 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_04.binproto
index e43f22a1bf..60867e13dd 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_05.binproto
index b3f7a909de..6da98923df 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_05.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_07.binproto
index b9e2bae3d7..14033143c8 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_07.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_08.binproto
index 36cbf428e9..d71c52eb57 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_08.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_10.binproto
index 236c6e59a5..a3163ea0f6 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_direct_story_reply_with_edits_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_05.binproto
deleted file mode 100644
index 036b4e3550..0000000000
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_05.binproto and /dev/null differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_06.binproto
deleted file mode 100644
index 995c196e9f..0000000000
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_06.binproto and /dev/null differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_07.binproto
deleted file mode 100644
index f976a18fd5..0000000000
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_07.binproto and /dev/null differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_08.binproto
deleted file mode 100644
index 0809c6f24a..0000000000
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_08.binproto and /dev/null differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_11.binproto
deleted file mode 100644
index 9195f80985..0000000000
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_11.binproto and /dev/null differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_12.binproto
deleted file mode 100644
index 88a49c03b3..0000000000
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_12.binproto and /dev/null differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_00.binproto
similarity index 88%
rename from app/src/androidTest/assets/backupTests/chat_item_poll_00.binproto
rename to app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_00.binproto
index 3060a40f4f..719563ed5d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_01.binproto
similarity index 84%
rename from app/src/androidTest/assets/backupTests/chat_item_poll_10.binproto
rename to app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_01.binproto
index c60140dc56..a5cfd06c44 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_10.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_02.binproto
similarity index 82%
rename from app/src/androidTest/assets/backupTests/chat_item_poll_02.binproto
rename to app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_02.binproto
index 2ea20b771c..2306fe2606 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_03.binproto
new file mode 100644
index 0000000000..f68ef274ad
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_04.binproto
new file mode 100644
index 0000000000..13ed67f388
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_05.binproto
new file mode 100644
index 0000000000..196a0fae0e
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_06.binproto
new file mode 100644
index 0000000000..fa386d346b
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_07.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_07.binproto
new file mode 100644
index 0000000000..5ca1f8055e
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_08.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_08.binproto
new file mode 100644
index 0000000000..8ebb2f159e
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_09.binproto
similarity index 87%
rename from app/src/androidTest/assets/backupTests/chat_item_poll_09.binproto
rename to app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_09.binproto
index a5a5ed1534..275440ab02 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_09.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_10.binproto
new file mode 100644
index 0000000000..2d7173644c
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_11.binproto
new file mode 100644
index 0000000000..384efdf0f7
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_12.binproto
new file mode 100644
index 0000000000..44192d6464
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_13.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_13.binproto
similarity index 83%
rename from app/src/androidTest/assets/backupTests/chat_item_poll_13.binproto
rename to app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_13.binproto
index cf0aa9eed7..74704084a1 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_13.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_14.binproto
similarity index 80%
rename from app/src/androidTest/assets/backupTests/chat_item_poll_14.binproto
rename to app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_14.binproto
index 2da61e7dea..23d97e83f3 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_14.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_multiple_vote_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_00.binproto
new file mode 100644
index 0000000000..5f0a36d0e9
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_01.binproto
new file mode 100644
index 0000000000..8a53387743
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_02.binproto
new file mode 100644
index 0000000000..c6fdad536f
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_02.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_03.binproto
new file mode 100644
index 0000000000..8cda42b19c
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_03.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_04.binproto
new file mode 100644
index 0000000000..9722e7aa96
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_04.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_05.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_05.binproto
new file mode 100644
index 0000000000..7e1df4e30f
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_05.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_06.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_06.binproto
new file mode 100644
index 0000000000..ddef43c65b
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_06.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_07.binproto
similarity index 85%
rename from app/src/androidTest/assets/backupTests/chat_item_poll_01.binproto
rename to app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_07.binproto
index b77670633d..ec00d82491 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_07.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_03.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_08.binproto
similarity index 80%
rename from app/src/androidTest/assets/backupTests/chat_item_poll_03.binproto
rename to app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_08.binproto
index 1a8d3ba534..9013e8e545 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_03.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_08.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_09.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_09.binproto
new file mode 100644
index 0000000000..c0269b0c25
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_09.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_10.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_10.binproto
new file mode 100644
index 0000000000..e55ed6af6a
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_10.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_11.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_11.binproto
new file mode 100644
index 0000000000..6ec5a07af1
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_11.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_12.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_12.binproto
new file mode 100644
index 0000000000..dacf87c204
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_12.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_04.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_13.binproto
similarity index 77%
rename from app/src/androidTest/assets/backupTests/chat_item_poll_04.binproto
rename to app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_13.binproto
index 1689262f8c..fc0c4a48b5 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_poll_04.binproto and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_13.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_14.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_14.binproto
new file mode 100644
index 0000000000..cdd34c925e
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_14.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_15.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_15.binproto
new file mode 100644
index 0000000000..07c40ce16a
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_15.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_16.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_16.binproto
new file mode 100644
index 0000000000..180528d8e8
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_16.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_17.binproto b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_17.binproto
new file mode 100644
index 0000000000..46a2b4efb6
Binary files /dev/null and b/app/src/androidTest/assets/backupTests/chat_item_poll_single_vote_17.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_00.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_00.binproto
index fc995a1de8..9214586050 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_00.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_00.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_01.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_01.binproto
index 4909328582..67c6c6a70d 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_01.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_01.binproto differ
diff --git a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_02.binproto b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_02.binproto
index eb364f517a..205b9fa5ee 100644
Binary files a/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_02.binproto and b/app/src/androidTest/assets/backupTests/chat_item_standard_message_with_edits_02.binproto differ