         cell.msgTextViewLeadingConstraint = leftConstraint
         cell.msgTextViewTrailingConstraint = rightConstraint
         
-        cell.msgTextViewBottomConstraint.constant += bottomMargin
+        cell.msgTextViewBottomConstraint.constant = messageViewMargins.bottom
     }
     
     // MARK: File attachment

        
        let contentView = cell.contentView
        
        let innerContentLeftMargin: CGFloat = 57
        let leftMargin: CGFloat = 80.0 + innerContentLeftMargin
        let rightMargin: CGFloat = 78.0
        let bottomMargin: CGFloat = -2.0
        
        cell.msgTextViewLeadingConstraint.isActive = false
        cell.msgTextViewTrailingConstraint.isActive = false
        
        let leftConstraint = messageTextView.leadingAnchor.constraint(greaterThanOrEqualTo: contentView.leadingAnchor, constant: leftMargin)
        
        let rightConstraint = messageTextView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -rightMargin)
        
        NSLayoutConstraint.activate([
            leftConstraint,

        cell.msgTextViewBottomConstraint.constant += messageViewInsets.bottom
        cell.msgTextViewTopConstraint.constant += messageViewInsets.top
        cell.msgTextViewLeadingConstraint.constant += messageViewInsets.left
        
        // Right inset is in fact margin in this case
        cell.msgTextViewTrailingConstraint.constant = messageViewInsets.right
    }
    
    private func getOutgoingMessageTextViewMargins(from bubbleCell: MXKRoomBubbleTableViewCell) -> UIEdgeInsets {
            
        let innerContentLeftMargin: CGFloat = 57
        
        let messageViewMarginTop: CGFloat = 0
        let messageViewMarginBottom: CGFloat = 0
        let messageViewMarginLeft: CGFloat = 80.0 + innerContentLeftMargin
        let messageViewMarginRight: CGFloat = 78.0
            
        let messageViewInsets = UIEdgeInsets(top: messageViewMarginTop, left: messageViewMarginLeft, bottom: messageViewMarginBottom, right: messageViewMarginRight)
                
        return messageViewInsets
    }
    
    private func setupOutgoingMessageTextViewMargins(for cell: MXKRoomBubbleTableViewCell) {
