diff --git a/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m b/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m
index e1329b190..a412b8109 100644
--- a/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m
+++ b/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m
@@ -16,21 +16,39 @@
 
 #import "BubbleRoomTimelineCellProvider.h"
 
+#pragma mark - Imports
+
+#pragma mark Text message
+
+// Outgoing
+
+// Clear
 #import "RoomOutgoingTextMsgBubbleCell.h"
 #import "RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h"
 #import "RoomOutgoingTextMsgWithPaginationTitleBubbleCell.h"
 #import "RoomOutgoingTextMsgWithoutSenderNameBubbleCell.h"
 #import "RoomOutgoingTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.h"
 
+// Encrypted
+
 #import "RoomOutgoingEncryptedTextMsgBubbleCell.h"
 #import "RoomOutgoingEncryptedTextMsgWithoutSenderInfoBubbleCell.h"
 #import "RoomOutgoingEncryptedTextMsgWithPaginationTitleBubbleCell.h"
 #import "RoomOutgoingEncryptedTextMsgWithoutSenderNameBubbleCell.h"
 #import "RoomOutgoingEncryptedTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.h"
 
+#pragma mark Attachment
+
+// Outgoing
+
+// Clear
 #import "RoomOutgoingAttachmentBubbleCell.h"
 #import "RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h"
 #import "RoomOutgoingAttachmentWithPaginationTitleBubbleCell.h"
+// Encrypted
+#import "RoomOutgoingEncryptedAttachmentBubbleCell.h"
+#import "RoomOutgoingEncryptedAttachmentWithoutSenderInfoBubbleCell.h"
+#import "RoomOutgoingEncryptedAttachmentWithPaginationTitleBubbleCell.h"
 
 @implementation BubbleRoomTimelineCellProvider
 
@@ -53,4 +71,19 @@
     };
 }
 
+- (NSDictionary<NSNumber*, Class>*)outgoingAttachmentCellsMapping
+{
+    // Hide sender info and avatar for bubble outgoing file attachment
+    return @{
+        // Clear
+        @(RoomTimelineCellIdentifierOutgoingAttachment) : RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.class,
+        @(RoomTimelineCellIdentifierOutgoingAttachmentWithoutSenderInfo) : RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.class,
+        @(RoomTimelineCellIdentifierOutgoingAttachmentWithPaginationTitle) : RoomOutgoingAttachmentWithPaginationTitleBubbleCell.class,
+        // Encrypted
+        @(RoomTimelineCellIdentifierOutgoingAttachmentEncrypted) : RoomOutgoingEncryptedAttachmentWithoutSenderInfoBubbleCell.class,
+        @(RoomTimelineCellIdentifierOutgoingAttachmentEncryptedWithoutSenderInfo) : RoomOutgoingEncryptedAttachmentWithoutSenderInfoBubbleCell.class,
+        @(RoomTimelineCellIdentifierOutgoingAttachmentEncryptedWithPaginationTitle) : RoomOutgoingEncryptedAttachmentWithPaginationTitleBubbleCell.class
+    };
+}
+
 @end