More accurate reply-to handling
Merge bug25362