reply-timeout had the wrong function, when compared to other gateways. Add remote-timeout to reflect the time we will wait for a reply from the remote system Make reply-timeout set the sendTimeout on the messaging template Set remore-timeout to reply-timeout (if set) unless remote-timeout is explicitly set. Update reference doc, and migration guide on Wiki.