Added timeout/retry to client message sending