diff --git a/app/src/main/java/com/nextcloud/talk/data/source/local/converters/ArrayListConverter.kt b/app/src/main/java/com/nextcloud/talk/data/source/local/converters/ArrayListConverter.kt
index 2248c3fc9..8474102c6 100644
--- a/app/src/main/java/com/nextcloud/talk/data/source/local/converters/ArrayListConverter.kt
+++ b/app/src/main/java/com/nextcloud/talk/data/source/local/converters/ArrayListConverter.kt
@@ -33,6 +33,6 @@ class ArrayListConverter {
             return null
         }
 
-        return LoganSquare.parseList(value, List::class.java) as ArrayList<String>?
+        return LoganSquare.parseList(value, String::class.java) as ArrayList<String>?
     }
 }
diff --git a/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt b/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt
index 9537d159d..84bfe9800 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt
@@ -164,18 +164,18 @@ class TalkSpecificViewThemeUtils @Inject constructor(
         }
     }
 
-    fun setCheckedBackground(linearLayout: LinearLayout, incoming: Boolean) {
+    fun setCheckedBackground(linearLayout: LinearLayout, outgoing: Boolean) {
         withScheme(linearLayout) { scheme ->
             val drawable = AppCompatResources
                 .getDrawable(linearLayout.context, R.drawable.reaction_self_background)!!
                 .mutate()
-            val backgroundColor = if (incoming) {
-                dynamicColor.primaryContainer().getArgb(scheme)
-            } else {
+            val backgroundColor = if (outgoing) {
                 ContextCompat.getColor(
                     linearLayout.context,
                     R.color.bg_message_list_incoming_bubble
                 )
+            } else {
+                dynamicColor.primaryContainer().getArgb(scheme)
             }
             DrawableCompat.setTintList(
                 drawable,