diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/IrcFormatSerializer.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/IrcFormatSerializer.kt
index db0feed9c75e1114b23a4daa6a47d2634f6e225d..f1a7cd2ce9c6b7ad923b5c9fecebda8bb805a4e4 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/IrcFormatSerializer.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/util/irc/format/IrcFormatSerializer.kt
@@ -97,10 +97,14 @@ class IrcFormatSerializer internal constructor(private val context: Context) {
       writeColor(foreground, background)
     }
 
-    fun writeHexColor(foreground: Int?) {
+    fun writeHexColor(foreground: Int?, background: Int?) {
       out.append(CODE_HEXCOLOR)
       if (foreground != null) {
         out.append(String.format(Locale.US, "%06x", foreground and 0x00FFFFFF))
+        if (background != null) {
+          out.append(',')
+          out.append(String.format(Locale.US, "%06x", background and 0x00FFFFFF))
+        }
       }
     }
 
@@ -184,7 +188,7 @@ class IrcFormatSerializer internal constructor(private val context: Context) {
             writeColor(afterForegroundCode, afterBackgroundCode)
           }
         } else {
-          writeHexColor(afterForeground)
+          writeHexColor(afterForeground, afterBackground)
         }
       }