Merge "Fix some color issues with Inline Reply" into nyc-dev