diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt
index e8d8c8876c..4391009b08 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt
@@ -165,7 +165,7 @@ class TextComposerView @JvmOverloads constructor(context: Context, attrs: Attrib
 
     fun setRoomEncrypted(isEncrypted: Boolean, roomEncryptionTrustLevel: RoomEncryptionTrustLevel?) {
         if (isEncrypted) {
-            composerEditText.setHint(R.string.room_message_placeholder_encrypted)
+            composerEditText.setHint(R.string.room_message_placeholder)
             composerShieldImageView.isVisible = true
             val shieldRes = when (roomEncryptionTrustLevel) {
                 RoomEncryptionTrustLevel.Trusted -> R.drawable.ic_shield_trusted
@@ -174,7 +174,7 @@ class TextComposerView @JvmOverloads constructor(context: Context, attrs: Attrib
             }
             composerShieldImageView.setImageDrawable(ContextCompat.getDrawable(context, shieldRes))
         } else {
-            composerEditText.setHint(R.string.room_message_placeholder_not_encrypted)
+            composerEditText.setHint(R.string.room_message_placeholder)
             composerShieldImageView.isVisible = false
         }
     }
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 50741dfaa1..6b0591595a 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -515,8 +515,8 @@
     <string name="room_one_user_is_typing">%s is typing…</string>
     <string name="room_two_users_are_typing">%1$s &#038; %2$s are typing…</string>
     <string name="room_many_users_are_typing">%1$s &#038; %2$s &#038; others are typing…</string>
-    <string name="room_message_placeholder_encrypted">Message…</string>
-    <string name="room_message_placeholder_not_encrypted">Message…</string>
+    <string name="room_message_placeholder_encrypted">Send an encrypted message…</string>
+    <string name="room_message_placeholder_not_encrypted">Send a message (unencrypted)…</string>
     <string name="room_message_placeholder_reply_to_encrypted">Send an encrypted reply…</string>
     <string name="room_message_placeholder_reply_to_not_encrypted">Send a reply (unencrypted)…</string>
     <string name="room_offline_notification">Connectivity to the server has been lost.</string>
diff --git a/vector/src/main/res/values/strings_riotX.xml b/vector/src/main/res/values/strings_riotX.xml
index 00bf65e121..025491f94b 100644
--- a/vector/src/main/res/values/strings_riotX.xml
+++ b/vector/src/main/res/values/strings_riotX.xml
@@ -6,7 +6,7 @@
     <!-- Sections has been created to avoid merge conflict. Let's see if it's better -->
 
     <!-- BEGIN Strings added by Valere -->
-
+    <string name="room_message_placeholder">Message…</string>
     <!-- END Strings added by Valere -->