 
     func containerHeightForMessage(message: MessageType) -> CGFloat {
 
-        let avatarSize = avatarSizeFor(message: message)
+        let avatarWidth = avatarSizeFor(message: message).width
         let insets = messageContainerInsets.left + messageContainerInsets.right
-        let availableWidth = itemWidth - avatarSize.width - avatarContainerSpacing - insets
+        let availableWidth = itemWidth - avatarWidth - avatarContainerSpacing - messageToEdgePadding - insets
 
         // This is a switch because support for more messages are to come
         switch message.data {


    open var messageContainerInsets: UIEdgeInsets

    fileprivate let avatarBottomSpacing: CGFloat = 4

    fileprivate let avatarContainerSpacing: CGFloat = 4


        let containerHeight = containerHeightForMessage(message: message)

        let avatarWidth = avatarSizeFor(message: message).width
        let insets = messageContainerInsets.left + messageContainerInsets.right
        let availableWidth = itemWidth - avatarWidth - avatarContainerSpacing - messageToEdgePadding - insets

        // This is a switch because support for more messages are to come
        switch message.data {
