Inconsistent margin in Android app

In the new Android update(switching from native to React), the margins between chat messages is inconsistent and quite ugly. It seems that padding is added when the message also has to show a user's profile pic. A potential solution would be to make the profile pic smaller so the chat lines are closer together, or increase the padding on all messages(bad solution imo). See screenshots for examples. https://imgur.com/a/jUdCn7V https://imgur.com/a/8U29cDi