         
         self.removeTimestampView()
         
-        self.addTimestampView(timestampView, rightMargin: 8.0, bottomMargin: 4.0)
+        self.addTimestampView(timestampView, rightMargin: BubbleRoomCellLayoutConstants.bubbleTimestampViewMargins.right, bottomMargin: BubbleRoomCellLayoutConstants.bubbleTimestampViewMargins.bottom)
         self.timestampView = timestampView
     }
     

import UIKit

class RoomMessageBubbleBackgroundView: UIView {
    
    // MARK: - Constant
    
    private enum Constants {
        static let cornerRadius: CGFloat = 12.0
    }
    
    // MARK: - Properties
    

    private func commonInit() {
        self.translatesAutoresizingMaskIntoConstraints = false
        self.layer.masksToBounds = true
        self.layer.cornerRadius = BubbleRoomCellLayoutConstants.bubbleCornerRadius
    }
    
    // MARK: - Public
