         let messageViewMarginTop: CGFloat
         let messageViewMarginBottom: CGFloat = -2.0
         let messageViewMarginLeft: CGFloat = 3.0
-        let messageViewMarginRight: CGFloat = 0.0
+        let messageViewMarginRight: CGFloat = 80
         
         if bubbleCell.userNameLabel != nil {
             messageViewMarginTop = 10.0


@objcMembers
class BubbleRoomCellLayoutUpdater: RoomCellLayoutUpdaterProtocol {
                    
    // MARK: - Constants
    
    private enum Constants {
        static let bubbleBackgroundViewCornerRadius: CGFloat = 12.0
    }
    
    // MARK: - Properties
    

    // MARK: - Public
    
    func updateLayoutIfNeeded(for cell: MXKRoomBubbleTableViewCell, andCellData cellData: MXKRoomBubbleCellData) {
        
        if cellData.isSenderCurrentUser {
            self.updateLayout(forOutgoingTextMessageCell: cell, andCellData: cellData)
        } else {
            self.updateLayout(forIncomingTextMessageCell: cell, andCellData: cellData)
        }
    }
            
    func updateLayout(forIncomingTextMessageCell cell: MXKRoomBubbleTableViewCell, andCellData cellData: MXKRoomBubbleCellData) {
