diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.h b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.h
index c8bdfaa82..1caf1315c 100644
--- a/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.h
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.h
@@ -173,7 +173,7 @@ extern NSString *const kMXKRoomDataSourceTimelineErrorErrorKey;
 /**
  The current attributed text message partially typed in text input (use nil to reset it).
  */
-@property (nonatomic) NSAttributedString *attributedPartialTextMessage;
+@property (nonatomic) NSAttributedString *partialAttributedTextMessage;
 
 /**
  The current thread id for the data source. If provided, data source displays the specified thread, otherwise the whole room messages.
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m
index c86a54605..dcd537b61 100644
--- a/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m
@@ -990,14 +990,14 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
     _room.partialTextMessage = partialTextMessage;
 }
 
-- (NSAttributedString *)attributedPartialTextMessage
+- (NSAttributedString *)partialAttributedTextMessage
 {
-    return _room.attributedPartialTextMessage;
+    return _room.partialAttributedTextMessage;
 }
 
-- (void)setAttributedPartialTextMessage:(NSAttributedString *)attributedPartialTextMessage
+- (void)setPartialAttributedTextMessage:(NSAttributedString *)partialAttributedTextMessage
 {
-    _room.attributedPartialTextMessage = attributedPartialTextMessage;
+    _room.partialAttributedTextMessage = partialAttributedTextMessage;
 }
 
 - (void)refreshEventListeners:(NSArray *)liveEventTypesFilterForMessages
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 642e60758..89984af88 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -680,7 +680,7 @@ static CGSize kThreadListBarButtonItemImageSize;
         // Note: We have to wait for viewDidAppear before updating growingTextView (viewWillAppear is too early)
         RoomInputToolbarView *inputToolbar = (RoomInputToolbarView *)self.inputToolbarView;
 
-        inputToolbar.attributedTextMessage = self.roomDataSource.attributedPartialTextMessage;
+        inputToolbar.attributedTextMessage = self.roomDataSource.partialAttributedTextMessage;
     }
 }
 
@@ -4698,7 +4698,7 @@ static CGSize kThreadListBarButtonItemImageSize;
     if (self.saveProgressTextInput && self.roomDataSource && inputToolbar)
     {
         // Store the potential message partially typed in text input
-        self.roomDataSource.attributedPartialTextMessage = inputToolbar.attributedTextMessage;
+        self.roomDataSource.partialAttributedTextMessage = inputToolbar.attributedTextMessage;
     }
 
     // Cancel potential selected event (to leave edition mode)