Retirement tax questions

If my IRA custodian paid 990-T taxes on $25,000 of income in my IRA now, and I then receive a $40,000 IRS distribution in 2019, I should pay income tax (on my 1040) on $15,000, not $40,000. Otherwise I'm paying tax on the same $25,000 twice.