Merge "Fix replying inline"