timeout migrated from getReplies() to addRequest() as expiration #2

I just recreated this patch to eliminate merge conflicts