diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java
index 45cdb7275..db025b8f6 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java
@@ -20,6 +20,9 @@
 
 package com.nextcloud.talk.adapters.messages;
 
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.support.v4.view.ViewCompat;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.view.View;
@@ -42,6 +45,13 @@ public class MagicSystemMessageViewHolder extends MessageHolders.IncomingTextMes
     public void onBind(ChatMessage message) {
         super.onBind(message);
 
+        Resources resources = NextcloudTalkApplication.getSharedApplication().getResources();
+
+        Drawable bubbleDrawable = DisplayUtils.getMessageSelector(resources.getColor(R.color.white_two),
+                resources.getColor(R.color.transparent),
+                resources.getColor(R.color.white_two), R.drawable.shape_grouped_incoming_message);
+        ViewCompat.setBackground(bubble, bubbleDrawable);
+
         Spannable messageString = new SpannableString(message.getText());
 
         if (message.getMessageParameters() != null && message.getMessageParameters().size() > 0) {