Merge "Fixed the paddings when replying with inline reply" into pi-dev am: e4c06663c8
am: b909e276f9

Change-Id: I721fb4e4b5d86b4c82a15e0897d4b823bfe22322