         
         return false
     }
+    
+    private func addTimestampLabel(_ timestampLabel: UILabel,
+                           to cell: MXKRoomBubbleTableViewCell,
+                           on containerView: UIView,
+                           constrainingView: UIView) {
+        timestampLabel.translatesAutoresizingMaskIntoConstraints = false
+
+        cell.addTemporarySubview(timestampLabel)
+                
+        containerView.addSubview(timestampLabel)
+
+        let rightMargin: CGFloat = 8.0
+        let bottomMargin: CGFloat = 4.0
+
+        let trailingConstraint = timestampLabel.trailingAnchor.constraint(equalTo: constrainingView.trailingAnchor, constant: -rightMargin)
+
+        let bottomConstraint = timestampLabel.bottomAnchor.constraint(equalTo: constrainingView.bottomAnchor, constant: -bottomMargin)
+
+        NSLayoutConstraint.activate([
+            trailingConstraint,
+            bottomConstraint
+        ])
+    }
 }

        
        // If cell contains a bubble background, add the timestamp inside of it
        if let bubbleBackgroundView = cell.messageBubbleBackgroundView, bubbleBackgroundView.isHidden == false, let timestampLabel = self.createTimestampLabel(for: cellData) {

            timestampLabel.translatesAutoresizingMaskIntoConstraints = false

            cell.addTemporarySubview(timestampLabel)

            bubbleBackgroundView.addSubview(timestampLabel)

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

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

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

            NSLayoutConstraint.activate([
                trailingConstraint,
                bottomConstraint
            ])
        } else if cellData.isAttachmentWithThumbnail {
                                                 
            if cellData.attachment?.type == .sticker {

    }
    
    // MARK: - Private
    
    // MARK: Timestamp management
    
    private func createTimestampLabel(cellData: MXKRoomBubbleCellData, bubbleComponent: MXKRoomBubbleComponent, viewTag: Int, textColor: UIColor) -> UILabel {
        
