diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
index e1dfd0eb8d5d7fd1dee9bbbcfc5cb2e6065335c5..03b4767ead2f1fb21dd02af7dca9472711ed6bd2 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
@@ -185,7 +185,7 @@ class QuasselMessageRenderer @Inject constructor(
     viewHolder.timeRight?.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize * 0.9f)
     viewHolder.name?.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize)
     viewHolder.realname?.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize)
-    val contentSize = if (messageSettings.largerEmoji && isEmoji) textSize * 2f else textSize
+    val contentSize = if (messageSettings.nicksOnNewLine && messageSettings.largerEmoji && isEmoji) textSize * 2f else textSize
     viewHolder.content?.setTextSize(TypedValue.COMPLEX_UNIT_SP, contentSize)
     viewHolder.combined?.setTextSize(TypedValue.COMPLEX_UNIT_SP, contentSize)
     val avatarContainerSize = TypedValue.applyDimension(