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

Change-Id: I77334cfab5d332d6faa0203809436aea60777864