diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/SystemMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/SystemMessageViewHolder.kt
index baf82d2d0..883642d03 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/SystemMessageViewHolder.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/SystemMessageViewHolder.kt
@@ -14,6 +14,7 @@ import android.text.SpannableString
 import android.text.TextPaint
 import android.text.method.LinkMovementMethod
 import android.text.style.ClickableSpan
+import android.util.TypedValue
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
@@ -76,6 +77,10 @@ class SystemMessageViewHolder(itemView: View) :
             R.drawable.shape_grouped_incoming_message
         )
         ViewCompat.setBackground(background, bubbleDrawable)
+        binding.messageText.setTextSize(
+            TypedValue.COMPLEX_UNIT_PX,
+            resources.getDimension(R.dimen.chat_system_message_text_size)
+        )
         var messageString: Spannable = SpannableString(message.text)
         if (message.messageParameters != null && message.messageParameters!!.size > 0) {
             for (key in message.messageParameters!!.keys) {
@@ -89,7 +94,13 @@ class SystemMessageViewHolder(itemView: View) :
                     } else {
                         individualMap["name"]
                     }
-                    messageString = DisplayUtils.searchAndColor(messageString, searchText!!, mentionColor)
+                    messageString =
+                        DisplayUtils.searchAndColor(
+                            messageString,
+                            searchText!!,
+                            mentionColor,
+                            resources.getDimensionPixelSize(R.dimen.chat_system_message_text_size)
+                        )
                     if (individualMap["link"] != null) {
                         val displayName = individualMap["name"] ?: ""
                         val link = (user.baseUrl + individualMap["link"])
diff --git a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt
index d35ee3663..857adf065 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt
@@ -292,7 +292,7 @@ object DisplayUtils {
         return spannableString
     }
 
-    fun searchAndColor(text: Spannable, searchText: String, @ColorInt color: Int): Spannable {
+    fun searchAndColor(text: Spannable, searchText: String, @ColorInt color: Int, textSize: Int): Spannable {
         val spannableString: Spannable = SpannableString(text)
         val stringText = text.toString()
         if (TextUtils.isEmpty(text) || TextUtils.isEmpty(searchText)) {
@@ -303,7 +303,6 @@ object DisplayUtils {
             Pattern.CASE_INSENSITIVE or Pattern.LITERAL or Pattern.MULTILINE
         )
             .matcher(spannableString)
-        val textSize = sharedApplication!!.resources.getDimensionPixelSize(R.dimen.chat_text_size)
         var lastStartIndex = -1
         while (m.find()) {
             val start = stringText.indexOf(m.group(), lastStartIndex)
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index d8e30fae0..81e6b4d59 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -26,8 +26,9 @@
     <dimen name="avatar_size_open_conversation_list">52dp</dimen>
 
     <dimen name="chat_text_size">16sp</dimen>
+    <dimen name="chat_system_message_text_size">14sp</dimen>
     <dimen name="message_bubble_corners_radius">20dp</dimen>
-    <dimen name="message_bubble_corners_horizontal_padding">16dp</dimen>
+    <dimen name="message_bubble_corners_horizontal_padding">14dp</dimen>
     <dimen name="message_bubble_corners_vertical_padding">12dp</dimen>
     <dimen name="message_bubble_checkmark_height">18dp</dimen>