diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/chatview/ChatMessageRenderer.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/chatview/ChatMessageRenderer.java
index 41e97b704d64ce72dae91eeaf1a1bba427b70ce8..349984701c41b47f3f40dd2feacaa9106bd0aa2d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/chatview/ChatMessageRenderer.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/chatview/ChatMessageRenderer.java
@@ -149,7 +149,9 @@ public class ChatMessageRenderer {
 
     private void onBindNick(@NonNull MessageViewHolder holder, @NonNull Message message) {
         applyStyle(holder, serverStyle, highlightStyle, message.flags.Highlight);
-        if (message.flags.Self)
+        // FIXME: Ugly hack to get around the issue that quasselcore doesn’t set the Self flag
+        boolean self = message.flags.Self || message.sender.equals(message.content);
+        if (self)
             holder.content.setText(context.themeUtil().translations.formatNick(
                     formatNick(message.sender, false)
             ));