I think this might solve the issue. I tested it on my account, and it works, but sometimes if I test, reply, or forward too quickly before syncing, the icon may not switch. By the way, so far, after enabling the setting, it’s working. I’ll keep monitoring and see how it goes.