1099-R reporting of after-tax (non-Roth) amounts

Happy Friday, everyone. I am wondering if any of you have some insight on reporting after-tax (non-Roth) distributions vs. Roth distributions. 

We have an individual taking a distribution of his after-tax (non-Roth) money. There are questions as to how reporting this transaction is different than reporting a Roth distribution. The main question comes down to which distribution code(s) the payer is to use in box 7.

For a [qualified] Roth distribution, the payer indicates:

• the full distribution amount in box 1;
• $0.00 in box 2a;
• the Roth contribution (basis) amount in box 5, and
• code "7B" for box 7
• year of first Roth contribution in box 11

This is what has been proposed for the After-tax (non-Roth) 1099-R:

• the full distribution amount in box 1;
• taxable earnings portion in box 2a;
• the after-tax (non-Roth) contribution (basis) amount in box 5, and
• code "7" in box 7

Anyone know if this is correct?

That is absolutely the correct method.

Thank you!