         case .cellLeading:
             origin.x = avatarSize.width + messageContainerPadding.left
         case .cellTrailing:
-            origin.x = cellFrame.maxX - avatarSize.width - messageContainerSize.width - messageContainerPadding.right
+            origin.x = cellFrame.width - avatarSize.width - messageContainerSize.width - messageContainerPadding.right
         case .natural:
             fatalError("AvatarPosition Horizontal.natural needs to be resolved.")
         }

        case .cellTop:
            break
        case .cellBottom:
            origin.y = cellFrame.maxY - avatarSize.height
        case .messageTop:
            origin.y = messageContainerFrame.maxY
        case .messageBottom:

        case .cellLeading:
            origin.x = topLabelPadding.left
        case .cellCenter:
            origin.x = (cellFrame.width/2) + topLabelPadding.left - topLabelPadding.right
        case .cellTrailing:
            origin.x = cellFrame.width - topLabelSize.width - topLabelPadding.right
        case .messageLeading:
            origin.x = messageContainerFrame.minX + topLabelPadding.left
        case .messageTrailing:
