Improve timer-fired-message forwarding