             return true
         default:
             break
+        }
+        
+        if let attachmentType = cellData.attachment?.type {
+            switch attachmentType {
+            case .voiceMessage, .audio:
+                return true
+            case .sticker:
+                // Do not show timestamp for stickers atm
+                return false
+            default:
+                break
+            }
+        }
+        
+        if cellData.isAttachmentWithThumbnail {
+            return true
         }
         
         switch firstEvent.eventType {

    
    // MARK: - Private
    
    private func createTimestampLabel(cellData: MXKRoomBubbleCellData, bubbleComponent: MXKRoomBubbleComponent, viewTag: Int) -> UILabel {
        
        let timeLabel = UILabel()

        timeLabel.text = cellData.eventFormatter.timeString(from: bubbleComponent.date)
        timeLabel.textAlignment = .right
        timeLabel.textColor = ThemeService.shared().theme.textSecondaryColor
        timeLabel.font = UIFont.systemFont(ofSize: 11, weight: .light)
        timeLabel.adjustsFontSizeToFitWidth = true
        timeLabel.tag = viewTag
        timeLabel.accessibilityIdentifier = "timestampLabel"
        
        return timeLabel
    }
    
    private func canShowTimestamp(forCellData cellData: MXKRoomBubbleCellData) -> Bool {

                trailingConstraint,
                bottomConstraint
            ])
        } else if cellData.isAttachmentWithThumbnail {
                                                 
            if cellData.attachment?.type == .sticker {
                // TODO: Handle sticker & selected sticker
            } else if let attachmentView = cell.attachmentView, let timestampLabel = self.createTimestampLabel(for: cellData, textColor: self.theme.baseIconPrimaryColor) {
                // For media with thumbnail cells, add timestamp inside thumbnail
                
                timestampLabel.translatesAutoresizingMaskIntoConstraints = false

                cell.addTemporarySubview(timestampLabel)
                
                let cellContentView = cell.contentView
                
                cellContentView.addSubview(timestampLabel)

                let rightMargin: CGFloat = 8.0
                let bottomMargin: CGFloat = 4.0

                let trailingConstraint = timestampLabel.trailingAnchor.constraint(equalTo: attachmentView.trailingAnchor, constant: -rightMargin)

                let bottomConstraint = timestampLabel.bottomAnchor.constraint(equalTo: attachmentView.bottomAnchor, constant: -bottomMargin)

                NSLayoutConstraint.activate([
                    trailingConstraint,
                    bottomConstraint
                ])
            } else {
                super.addTimestampLabel(toCell: cell, cellData: cellData)
            }
        } else {
            super.addTimestampLabel(toCell: cell, cellData: cellData)
        }
