Improve the way we cut the bubble layout to give space for the sender Avatar

Improve the way we cut the bubble layout to give space for the sender Avatar #6159