diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 93c5a1c1368feafb31b01c5777955c5d70b305c7..b72415217b351ff92aa89b4c97ec88aac775b9af 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -3063,16 +3063,25 @@ public class ConversationFragment extends XmppFragment
             return false;
         }
 
+        final var cursord = getResources().getDrawable(R.drawable.cursor_on_tertiary_container);
         if (activity.xmppConnectionService != null && activity.xmppConnectionService.getAccounts().size() > 1) {
             final var colors = MaterialColors.getColorRoles(activity, conversation.getAccount().getColor(activity.isDark()));
+            cursord.setTintList(ColorStateList.valueOf(colors.getOnAccentContainer()));
             binding.inputLayout.setBackgroundTintList(ColorStateList.valueOf(colors.getAccentContainer()));
             binding.textinputSubject.setTextColor(colors.getOnAccentContainer());
             binding.textinput.setTextColor(colors.getOnAccentContainer());
+            binding.textinputSubject.setHintTextColor(ColorStateList.valueOf(colors.getOnAccentContainer()).withAlpha(115));
+            binding.textinput.setHintTextColor(ColorStateList.valueOf(colors.getOnAccentContainer()).withAlpha(115));
         } else {
+            cursord.setTintList(ColorStateList.valueOf(MaterialColors.getColor(binding.textinput, com.google.android.material.R.attr.colorOnTertiaryContainer)));
             binding.inputLayout.setBackgroundTintList(ColorStateList.valueOf(MaterialColors.getColor(binding.inputLayout, com.google.android.material.R.attr.colorTertiaryContainer)));
             binding.textinputSubject.setTextColor(MaterialColors.getColor(binding.textinputSubject, com.google.android.material.R.attr.colorOnTertiaryContainer));
             binding.textinput.setTextColor(MaterialColors.getColor(binding.textinput, com.google.android.material.R.attr.colorOnTertiaryContainer));
+            binding.textinputSubject.setHintTextColor(R.color.hint_on_tertiary_container);
+            binding.textinput.setHintTextColor(R.color.hint_on_tertiary_container);
         }
+        binding.textinputSubject.setTextCursorDrawable(cursord);
+        binding.textinput.setTextCursorDrawable(cursord);
 
         setThread(conversation.getThread());
         setupReply(conversation.getReplyTo());
diff --git a/src/main/res/drawable/cursor_on_tertiary_container.xml b/src/main/res/drawable/cursor_on_tertiary_container.xml
index 9a86446ec6cdbc6458c93d502f6b9f6ca7d5d813..027c92de2893616905ccd142f600255d720b63a2 100644
--- a/src/main/res/drawable/cursor_on_tertiary_container.xml
+++ b/src/main/res/drawable/cursor_on_tertiary_container.xml
@@ -3,4 +3,4 @@
     <size android:width="2dp" />
     <!-- width of the original cursor was measured on a Pixel 6a because it’s not documented anywhere -->
     <solid android:color="?colorOnTertiaryContainer" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index 29cdbe54596fa43b345718dd0836367f83b0cb3e..1c3ecd14a57cc0daf2c4c63baa0344e134a15696 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -149,6 +149,7 @@
                             android:minHeight="32dp"
                             android:textColor="?colorOnTertiaryContainer"
                             android:textColorHint="@color/hint_on_tertiary_container"
+                            android:textCursorDrawable="@drawable/cursor_on_tertiary_container"
                             android:minLines="1">
 
                             <requestFocus />