diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt
index c45339a0a..f3135f6c6 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt
@@ -249,11 +249,12 @@ class MessageActionsDialog(
             isPermitted(hasChatPermission) &&
             isReactableMessageType(message)
         ) {
-            val recentEmojiManager = RecentEmojiManager(context, 6)
+            val recentEmojiManager = RecentEmojiManager(context, 8)
             val recentEmojis = recentEmojiManager.getRecentEmojis()
             val searchEmojiManager = SearchEmojiManager()
 
-            val initialSearchKeywords = listOf("thumbsup", "thumbsdown", "heart", "joy", "confused", "cry")
+            val initialSearchKeywords = listOf("thumbsup", "thumbsdown", "heart", "joy", "confused", "cry","pray",
+                "fire")
             val initialEmojisFromSearch = mutableSetOf<Emoji>()
 
             initialSearchKeywords.forEach { keyword ->
@@ -261,11 +262,11 @@ class MessageActionsDialog(
                 if (searchResults.isNotEmpty()) {
                     initialEmojisFromSearch.add(searchResults[0].component1())
                 }
-                if (initialEmojisFromSearch.size >= 6) {
+                if (initialEmojisFromSearch.size >= 8) {
                     return@forEach
                 }
             }
-            val combinedEmojis = (recentEmojis + initialEmojisFromSearch).toList().distinct().take(6)
+            val combinedEmojis = (recentEmojis + initialEmojisFromSearch).toList().distinct().take(8)
 
             val emojiSearchKeywords = mapOf(
                 "👍" to "thumbsup",
@@ -273,7 +274,9 @@ class MessageActionsDialog(
                 "❤️" to "heart",
                 "😂" to "joy",
                 "😕" to "confused",
-                "😢" to "cry"
+                "😢" to "cry",
+                "🙏" to "pray",
+                "🔥" to "fire"
             )
 
             val emojiTextViews = listOf(
@@ -282,7 +285,9 @@ class MessageActionsDialog(
                 dialogMessageActionsBinding.emojiHeart,
                 dialogMessageActionsBinding.emojiLaugh,
                 dialogMessageActionsBinding.emojiConfused,
-                dialogMessageActionsBinding.emojiCry
+                dialogMessageActionsBinding.emojiCry,
+                dialogMessageActionsBinding.emojiPray,
+                dialogMessageActionsBinding.emojiFire
             )
 
             emojiTextViews.forEachIndexed { index, textView ->
diff --git a/app/src/main/res/layout/dialog_message_actions.xml b/app/src/main/res/layout/dialog_message_actions.xml
index a9027197e..9500c1d1a 100644
--- a/app/src/main/res/layout/dialog_message_actions.xml
+++ b/app/src/main/res/layout/dialog_message_actions.xml
@@ -17,9 +17,15 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
+    <HorizontalScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fillViewport="true"
+        android:scrollbars="none">
+
     <LinearLayout
         android:id="@+id/emojiBar"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/standard_quarter_margin"
         android:layout_marginTop="@dimen/standard_half_margin"
@@ -94,6 +100,28 @@
             android:text="@string/emoji_sad"
             android:textSize="20sp" />
 
+        <com.vanniktech.emoji.EmojiTextView
+            android:id="@+id/emojiPray"
+            android:layout_width="@dimen/reaction_bottom_sheet_layout_size"
+            android:layout_height="@dimen/reaction_bottom_sheet_layout_size"
+            android:layout_marginLeft="@dimen/standard_quarter_margin"
+            android:layout_marginRight="@dimen/standard_quarter_margin"
+            android:cursorVisible="false"
+            android:gravity="center"
+            android:text="@string/emoji_pray"
+            android:textSize="20sp" />
+
+        <com.vanniktech.emoji.EmojiTextView
+            android:id="@+id/emojiFire"
+            android:layout_width="@dimen/reaction_bottom_sheet_layout_size"
+            android:layout_height="@dimen/reaction_bottom_sheet_layout_size"
+            android:layout_marginLeft="@dimen/standard_quarter_margin"
+            android:layout_marginRight="@dimen/standard_half_margin"
+            android:cursorVisible="false"
+            android:gravity="center"
+            android:text="@string/emoji_fire"
+            android:textSize="20sp" />
+
         <com.vanniktech.emoji.EmojiEditText
             android:id="@+id/emojiMore"
             android:layout_width="0dp"
@@ -106,6 +134,7 @@
             android:paddingStart="@dimen/zero"
             android:paddingEnd="@dimen/standard_padding" />
     </LinearLayout>
+    </HorizontalScrollView>
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1440edc32..9019ae964 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -378,6 +378,8 @@ How to translate with transifex:
     <string name="emoji_heart" translatable="false">❤️</string>
     <string name="emoji_confused" translatable="false">😯</string>
     <string name="emoji_sad" translatable="false">😢</string>
+    <string name="emoji_pray" translatable="false">🙏</string>
+    <string name="emoji_fire" translatable="false">🔥</string>
     <string name="emoji_more" translatable="false">More emojis</string>
     <string name="dontClear">Don\'t clear</string>
     <string name="today">Today</string>