diff --git a/Riot/Modules/Room/Views/BubbleCells/Styles/Plain/PlainRoomTimelineCellProvider.h b/Riot/Modules/Room/Views/BubbleCells/Styles/Plain/PlainRoomTimelineCellProvider.h
index 12b1876ee..302e63f1b 100644
--- a/Riot/Modules/Room/Views/BubbleCells/Styles/Plain/PlainRoomTimelineCellProvider.h
+++ b/Riot/Modules/Room/Views/BubbleCells/Styles/Plain/PlainRoomTimelineCellProvider.h
@@ -20,10 +20,18 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface PlainRoomTimelineCellProvider: NSObject<RoomTimelineCellProvider>
 
+#pragma mark - Registration
+
+- (void)registerVoiceMessageCellsForTableView:(UITableView*)tableView;
+
+#pragma mark - Mapping
+
 - (NSDictionary<NSNumber*, Class>*)outgoingTextMessageCellsMapping;
 
 - (NSDictionary<NSNumber*, Class>*)outgoingAttachmentCellsMapping;
 
+- (NSDictionary<NSNumber*, Class>*)voiceMessageCellsMapping;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/Riot/Modules/Room/Views/BubbleCells/Styles/Plain/PlainRoomTimelineCellProvider.m b/Riot/Modules/Room/Views/BubbleCells/Styles/Plain/PlainRoomTimelineCellProvider.m
index e36abb851..18d2c6ed8 100644
--- a/Riot/Modules/Room/Views/BubbleCells/Styles/Plain/PlainRoomTimelineCellProvider.m
+++ b/Riot/Modules/Room/Views/BubbleCells/Styles/Plain/PlainRoomTimelineCellProvider.m
@@ -425,9 +425,14 @@
 - (NSDictionary<NSNumber*, Class>*)voiceMessageCellsMapping
 {
     return @{
-        @(RoomTimelineCellIdentifierVoiceMessage) : VoiceMessageBubbleCell.class,
-        @(RoomTimelineCellIdentifierVoiceMessageWithoutSenderInfo) : VoiceMessageWithoutSenderInfoBubbleCell.class,
-        @(RoomTimelineCellIdentifierVoiceMessageWithPaginationTitle) : VoiceMessageWithPaginationTitleBubbleCell.class,
+        // Incoming
+        @(RoomTimelineCellIdentifierIncomingVoiceMessage) : VoiceMessageBubbleCell.class,
+        @(RoomTimelineCellIdentifierIncomingVoiceMessageWithoutSenderInfo) : VoiceMessageWithoutSenderInfoBubbleCell.class,
+        @(RoomTimelineCellIdentifierIncomingVoiceMessageWithPaginationTitle) : VoiceMessageWithPaginationTitleBubbleCell.class,
+        // Outoing
+        @(RoomTimelineCellIdentifierOutgoingVoiceMessage) : VoiceMessageBubbleCell.class,
+        @(RoomTimelineCellIdentifierOutgoingVoiceMessageWithoutSenderInfo) : VoiceMessageWithoutSenderInfoBubbleCell.class,
+        @(RoomTimelineCellIdentifierOutgoingVoiceMessageWithPaginationTitle) : VoiceMessageWithPaginationTitleBubbleCell.class
     };
 }