I’m fine if someone wants to implement the Thunderbird way that we discussed in the PR.