diff --git a/src/app/commoncomponents/TextMessageDelegate.qml b/src/app/commoncomponents/TextMessageDelegate.qml
index adaa0bbee7d9b926851a9de7f10cd5aef4914fd3..229e7d2ae0d4d392ead69833d04384059827a1af 100644
--- a/src/app/commoncomponents/TextMessageDelegate.qml
+++ b/src/app/commoncomponents/TextMessageDelegate.qml
@@ -78,7 +78,7 @@ SBSMessageBase {
 
             wrapMode: Label.WrapAtWordBoundaryOrAnywhere
             selectByMouse: true
-            font.pixelSize: isEmojiOnly? JamiTheme.chatviewEmojiSize : JamiTheme.chatviewFontSize
+            font.pixelSize: isEmojiOnly? JamiTheme.chatviewEmojiSize : JamiTheme.emojiBubbleSize
             font.hintingPreference: Font.PreferNoHinting
             renderType: Text.NativeRendering
             textFormat: Text.MarkdownText
diff --git a/src/libclient/messagelistmodel.cpp b/src/libclient/messagelistmodel.cpp
index 0e64cf44ffd220b5292ee467f218a5fa5a4c7484..b9c98b188b0cf8e3d6a3da838641c6a7f2aae7f4 100644
--- a/src/libclient/messagelistmodel.cpp
+++ b/src/libclient/messagelistmodel.cpp
@@ -479,7 +479,8 @@ MessageListModel::dataForItem(item_t item, int, int role) const
     case Role::Readers:
         return QVariant(messageToReaders_[item.first]);
     case Role::IsEmojiOnly:
-        return QVariant(isOnlyEmoji(item.second.body));
+        return QVariant(replyId.isEmpty() && item.second.previousBodies.isEmpty()
+                        && isOnlyEmoji(item.second.body));
     case Role::Reactions:
         return QVariant(item.second.reactions);
     default: