                                        rightMargin: rightMargin,
                                        bottomMargin: bottomMargin)
                 
-            } else if let attachmentView = cell.attachmentView, let timestampLabel = self.createTimestampLabel(for: cellData, textColor: self.theme.baseIconPrimaryColor) {
+            } else if let attachmentView = cell.attachmentView {
                 // For media with thumbnail cells, add timestamp inside thumbnail
+                
+                timestampLabel.textColor = self.theme.baseIconPrimaryColor
                 
                 self.addTimestampLabel(timestampLabel,
                                        to: cell,

            } else {
                super.addTimestampLabel(toCell: cell, cellData: cellData)
            }
        } else if let voiceMessageCell = cell as? VoiceMessageBubbleCell, let playbackView = voiceMessageCell.playbackController?.playbackView, let timestampLabel = self.createTimestampLabel(for: cellData) {
            
            // Add timestamp on cell inherting from VoiceMessageBubbleCell
            

        
    override func addTimestampLabel(toCell cell: MXKRoomBubbleTableViewCell, cellData: RoomBubbleCellData) {
        
        guard let timestampLabel = self.createTimestampLabel(for: cellData) else {
            super.addTimestampLabel(toCell: cell, cellData: cellData)
            return
        }
        
        if let timestampDisplayable = cell as? TimestampDisplayable {
            
            timestampDisplayable.addTimestampView(timestampLabel)
            
        } else if cellData.isAttachmentWithThumbnail {
                                                 
            if cellData.attachment?.type == .sticker,
               let attachmentView = cell.attachmentView {
                
                // Prevent overlap with send status icon
                let bottomMargin: CGFloat = 20.0
