Fixed padding issues in the messages