ESSENTIALS-415: Fix body padding again