Sounds reasonable. Changing it. But I don't see wrong to have a fallback. Take into account that we'll be breaking the flow for the whole inbox.