diff --git a/changelog.d/4698.bugfix b/changelog.d/4698.bugfix
new file mode 100644
index 0000000000..bcf20dd75f
--- /dev/null
+++ b/changelog.d/4698.bugfix
@@ -0,0 +1 @@
+Fix a crash in the timeline with some Emojis. Also migrate to androidx.emoji2
\ No newline at end of file