Merge "Fixed the padding when the sender name was empty" into pi-dev