This update cleans up internal layout code in the Mail app, including naming changes that make the code easier to maintain. It does not introduce visible feature changes, but supports future improvements by keeping the calling interface code more consistent.

part of task-2692836