Merge "Fixed the paddings in inbox style to match the rest of the templates"...
Merge "Fixed the paddings in inbox style to match the rest of the templates" into nyc-dev am: 14d8be72 am: 21b28f2a
am: 9ea6705d
* commit '9ea6705d':
Fixed the paddings in inbox style to match the rest of the templates
Change-Id: Ic2fd4ca7b66a18aec74fd51b36a44cadbd2af85d