After reading through the RFC [1] I realized that we have to increment the rpc_id when we resend a message. This patch therefor doesn't change the rpc_id behaviour, but adds a dynamic increment of the "time to wait before time out". Apart we just drop messages which are replies to timed out requests. Any comments are welcome.