Fixed some messages where the text shown on the screen was more than 17 characters