Merge "Revert "E-mail subject truncation is over-eager""