diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 5975ace6a..dbdc1126a 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -82,7 +82,7 @@
 
 #import "MXSDKOptions.h"
 
-#import "RoomTimelineCellProviderProtocol.h"
+#import "RoomTimelineCellProvider.h"
 
 #import "GeneratedInterface-Swift.h"
 
diff --git a/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineStyle.swift b/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineStyle.swift
index 5c5c6d4ac..2952550a0 100644
--- a/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineStyle.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineStyle.swift
@@ -30,7 +30,7 @@ class BubbleRoomTimelineStyle: RoomTimelineStyle {
     
     let cellLayoutUpdater: RoomCellLayoutUpdater?
     
-    let cellProvider: RoomTimelineCellProviderProtocol
+    let cellProvider: RoomTimelineCellProvider
     
     let cellDecorator: RoomTimelineCellDecorator
     
diff --git a/Riot/Modules/Room/Views/BubbleCells/Styles/Plain/PlainRoomTimelineCellProvider.h b/Riot/Modules/Room/Views/BubbleCells/Styles/Plain/PlainRoomTimelineCellProvider.h
index 7c3d16294..12b1876ee 100644
--- a/Riot/Modules/Room/Views/BubbleCells/Styles/Plain/PlainRoomTimelineCellProvider.h
+++ b/Riot/Modules/Room/Views/BubbleCells/Styles/Plain/PlainRoomTimelineCellProvider.h
@@ -14,14 +14,16 @@
 // limitations under the License.
 //
 
-#import "RoomTimelineCellProviderProtocol.h"
+#import "RoomTimelineCellProvider.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface PlainRoomTimelineCellProvider: NSObject<RoomTimelineCellProviderProtocol>
+@interface PlainRoomTimelineCellProvider: NSObject<RoomTimelineCellProvider>
 
 - (NSDictionary<NSNumber*, Class>*)outgoingTextMessageCellsMapping;
 
+- (NSDictionary<NSNumber*, Class>*)outgoingAttachmentCellsMapping;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/Riot/Modules/Room/Views/BubbleCells/Styles/Plain/PlainRoomTimelineStyle.swift b/Riot/Modules/Room/Views/BubbleCells/Styles/Plain/PlainRoomTimelineStyle.swift
index 1d4f498ec..542f2709a 100644
--- a/Riot/Modules/Room/Views/BubbleCells/Styles/Plain/PlainRoomTimelineStyle.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/Styles/Plain/PlainRoomTimelineStyle.swift
@@ -30,7 +30,7 @@ class PlainRoomTimelineStyle: RoomTimelineStyle {
     
     let cellLayoutUpdater: RoomCellLayoutUpdater?
     
-    let cellProvider: RoomTimelineCellProviderProtocol
+    let cellProvider: RoomTimelineCellProvider
     
     let cellDecorator: RoomTimelineCellDecorator    
  
diff --git a/Riot/Modules/Room/Views/BubbleCells/Styles/RoomTimelineCellProviderProtocol.h b/Riot/Modules/Room/Views/BubbleCells/Styles/RoomTimelineCellProvider.h
similarity index 95%
rename from Riot/Modules/Room/Views/BubbleCells/Styles/RoomTimelineCellProviderProtocol.h
rename to Riot/Modules/Room/Views/BubbleCells/Styles/RoomTimelineCellProvider.h
index 66fc17ee4..40037c3a2 100644
--- a/Riot/Modules/Room/Views/BubbleCells/Styles/RoomTimelineCellProviderProtocol.h
+++ b/Riot/Modules/Room/Views/BubbleCells/Styles/RoomTimelineCellProvider.h
@@ -22,7 +22,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /// Enables to register and provide room timeline cells
-@protocol RoomTimelineCellProviderProtocol <NSObject>
+@protocol RoomTimelineCellProvider <NSObject>
 
 /// Register timeline cells for the given table view
 - (void)registerCellsForTableView:(UITableView*)tableView;
diff --git a/Riot/Modules/Room/Views/BubbleCells/Styles/RoomTimelineStyle.swift b/Riot/Modules/Room/Views/BubbleCells/Styles/RoomTimelineStyle.swift
index 18c91be97..dc6e67ca1 100644
--- a/Riot/Modules/Room/Views/BubbleCells/Styles/RoomTimelineStyle.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/Styles/RoomTimelineStyle.swift
@@ -30,7 +30,7 @@ protocol RoomTimelineStyle: Themable {
     var cellLayoutUpdater: RoomCellLayoutUpdater? { get }
     
     /// Register and provide timeline cells
-    var cellProvider: RoomTimelineCellProviderProtocol { get }
+    var cellProvider: RoomTimelineCellProvider { get }
     
     /// Handle cell decorations (reactions, read receipts, URL preview, …)
     var cellDecorator: RoomTimelineCellDecorator { get }
diff --git a/Riot/SupportingFiles/Riot-Bridging-Header.h b/Riot/SupportingFiles/Riot-Bridging-Header.h
index ed95cb775..9eaae3a43 100644
--- a/Riot/SupportingFiles/Riot-Bridging-Header.h
+++ b/Riot/SupportingFiles/Riot-Bridging-Header.h
@@ -46,7 +46,7 @@
 #import "NSArray+Element.h"
 #import "ShareItemSender.h"
 #import "HTMLFormatter.h"
-#import "RoomTimelineCellProviderProtocol.h"
+#import "RoomTimelineCellProvider.h"
 #import "PlainRoomTimelineCellProvider.h"
 #import "BubbleRoomTimelineCellProvider.h"