Inline reply field
Pull in Heroku fixes