[Messaging] Reset session timeout only if not a timeout, or on send