diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 5ac795afb..8de3a5097 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -1993,9 +1993,9 @@ static CGSize kThreadListBarButtonItemImageSize;
     [self updateInputToolBarVisibility];
     
     // Check whether the input toolbar is ready before updating it.
-    if (self.inputToolbarView && [self.inputToolbarView isKindOfClass:RoomInputToolbarView.class])
+    if (self.inputToolbarView && [self inputToolbarConformsToToolbarViewProtocol])
     {
-        RoomInputToolbarView *roomInputToolbarView = (RoomInputToolbarView*)self.inputToolbarView;
+        id<RoomInputToolbarViewProtocol> roomInputToolbarView = (id<RoomInputToolbarViewProtocol>) self.inputToolbarView;
         
         // Update encryption decoration if needed
         [self updateEncryptionDecorationForRoomInputToolbar:roomInputToolbarView];
diff --git a/changelog.d/6935.change b/changelog.d/6935.change
new file mode 100644
index 000000000..43807527e
--- /dev/null
+++ b/changelog.d/6935.change
@@ -0,0 +1 @@
+Added a responsive placeholder text to the Rich Text Composer