diff --git a/src/Utils.cpp b/src/Utils.cpp
index 0ea5565b..3d29481c 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -141,7 +141,11 @@ utils::replaceEmoji(const QString &body)
         if (!insideTag && utils::codepointIsEmoji(code)) {
             if (!insideFontBlock) {
                 fmtBody += QStringLiteral("<font face=\"") % UserSettings::instance()->emojiFont() %
-                           QStringLiteral("\" size=\"4\">");
+                           QStringLiteral("\"") %
+                           (UserSettings::instance()->enlargeEmojiOnlyMessages()
+                              ? QStringLiteral(" size=\"4\"")
+                              : QString{}) %
+                           QStringLiteral(">");
                 insideFontBlock = true;
             } else if (code == 0xfe0f) {
                 // BUG(Nico):