MessageTimeout configuration parameter rather than always 3 seconds. Patch from Matthieu Hautreux, CEA.