I'm not sure this is adequate.

if you do this, you won't get the resendHandler back (as we remove it when we resend a message), neither the airplane mode notification.

I think this is a "optimization" that we don't need anyway, so please remove it.