Rearrange email text.

From #5881.