- harmonize the margins/spacings in other message components - fix warnings - cleanup/remove some dead code Fixes #8295