Merge "Fixed the paddings in inbox style to match the rest of the templates" into nyc-dev