Aravind | #240 | Changing message timeout to 5s