[#83691330] Revise inbox entry layout.
Merge branch 'in-progress'