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 15d7c1785c52253752735eba132191d585f13603..72688b529327817f96a247a5af5d4f0cf9e4e0bd 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
@@ -218,6 +218,13 @@ class QuasselMessageRenderer @Inject constructor(
           marginEnd = margin
         }
       }
+
+    viewHolder.messageContainer?.apply {
+      val horizontal = context.resources.getDimensionPixelSize(R.dimen.message_horizontal)
+      val vertical = context.resources.getDimensionPixelSize(R.dimen.message_vertical)
+
+      setPadding(horizontal, vertical, horizontal, vertical)
+    }
   }
 
   override fun bind(holder: MessageAdapter.QuasselMessageViewHolder, message: FormattedMessage,
@@ -235,8 +242,8 @@ class QuasselMessageRenderer @Inject constructor(
     ).roundToInt()
 
     val self = message.content.flag.hasFlag(Message_Flag.Self)
-    val highlight__ = message.content.flag.hasFlag(Message_Flag.Highlight)
-    val monochromeForeground = highlight__ && monochromeHighlights
+    val highlight = message.content.flag.hasFlag(Message_Flag.Highlight)
+    val monochromeForeground = highlight && monochromeHighlights
     return when (message.content.type.enabledValues().firstOrNull()) {
       Message_Type.Plain        -> {
         val realName = ircFormatDeserializer.formatString(message.content.realName,
diff --git a/app/src/main/res/layout/widget_chatmessage_plain.xml b/app/src/main/res/layout/widget_chatmessage_plain.xml
index 798547197df2c1501427ebf491ca9d8081c70ddd..081f6ad2e7ee8e372be8d1ec2e7014f032c9cd7c 100644
--- a/app/src/main/res/layout/widget_chatmessage_plain.xml
+++ b/app/src/main/res/layout/widget_chatmessage_plain.xml
@@ -33,10 +33,8 @@
     android:background="?attr/backgroundMenuItem"
     android:orientation="horizontal"
     android:paddingBottom="@dimen/message_vertical"
-    android:paddingEnd="@dimen/message_horizontal"
     android:paddingLeft="@dimen/message_horizontal"
     android:paddingRight="@dimen/message_horizontal"
-    android:paddingStart="@dimen/message_horizontal"
     android:paddingTop="@dimen/message_vertical"
     android:textAppearance="?android:attr/textAppearanceListItemSmall">