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
* commit '21b28f2a':
Fixed the paddings in inbox style to match the rest of the templates
Change-Id: I1f3ccc2f6df54d71129d2b773bda4c7458dec13d