1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
index 4cdce8aca..7a1809a98 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
@@ -859,7 +859,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
             }
         }
 
-        boolean darkBackground = type == RECEIVED && !isInValidSession || activity.isDarkTheme();
+        boolean darkBackground = activity.isDarkTheme();
 
         if (type == DATE_SEPARATOR) {
             if (UIHelper.today(message.getTimeSent())) {
@@ -987,6 +987,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
             if (isInValidSession) {
                 viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_light);
                 viewHolder.encryption.setVisibility(View.GONE);
+                viewHolder.encryption.setTextColor(this.getMessageTextColor(darkBackground, false));
             } else {
                 viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_warning);
                 viewHolder.encryption.setVisibility(View.VISIBLE);