diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 251a4fe5cb00dc6430f2f9ff8ed8fc40846430df..ac4252464c3ba56b6521053ca46681c1101b91d8 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -923,7 +923,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             }
         }
 
-        boolean darkBackground = type == RECEIVED && (!isInValidSession || mUseGreenBackground) || activity.isDarkTheme();
+        boolean darkBackground = (type == RECEIVED && mUseGreenBackground) || activity.isDarkTheme();
 
         if (type == DATE_SEPARATOR) {
             if (UIHelper.today(message.getTimeSent())) {
@@ -1116,13 +1116,13 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                 viewHolder.commands_list.setOnItemClickListener(null);
             }
 
+            if (!mUseGreenBackground) {
+                viewHolder.message_box.getBackground().setColorFilter(
+                    StyledAttributes.getColor(activity, mUseGreenBackground ? R.attr.message_bubble_received_bg : R.attr.color_background_primary),
+                    PorterDuff.Mode.SRC_ATOP
+                );
+            }
             if (isInValidSession) {
-                if (!mUseGreenBackground) {
-                    viewHolder.message_box.getBackground().setColorFilter(
-                        StyledAttributes.getColor(activity, mUseGreenBackground ? R.attr.message_bubble_received_bg : R.attr.color_background_primary),
-                        PorterDuff.Mode.SRC_ATOP
-                    );
-                }
                 viewHolder.encryption.setVisibility(View.GONE);
             } else {
                 viewHolder.encryption.setVisibility(View.VISIBLE);
@@ -1143,6 +1143,14 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             }
         }
 
+        if (darkBackground) {
+            if (viewHolder.subject != null) viewHolder.subject.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_OnDark_Bold);
+            if (viewHolder.encryption != null) viewHolder.encryption.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_OnDark_Bold);
+        } else {
+            if (viewHolder.subject != null) viewHolder.subject.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_Bold);
+            if (viewHolder.encryption != null) viewHolder.encryption.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_Bold);
+        }
+
         displayStatus(viewHolder, message, type, darkBackground);
 
         return view;
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 05b2841147610db013835c9a7e1b46a89f11e4bb..113911376a02e656b1b5e7975782f8ba5d8b2670 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -123,6 +123,10 @@
         <item name="android:textStyle">bold</item>
     </style>
 
+    <style name="TextAppearance.Conversations.Caption.Bold" parent="TextAppearance.Conversations.Caption">
+        <item name="android:textStyle">bold</item>
+    </style>
+
     <style name="TextAppearance.Conversations.Caption.Warning" parent="TextAppearance.Conversations.Caption">
         <item name="android:textColor">@color/red_a700</item>
     </style>